James Moger
2013-09-17 557a1fa25a0a1d60bdb71ea3ad0e4e9a9cd9cc61
Ignore the contents of a default .git/description file
2 files modified
7 ■■■■ changed files
releases.moxie 1 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/GitBlit.java 6 ●●●●● patch | view | raw | blame | history
releases.moxie
@@ -11,6 +11,7 @@
    security: ~
    fixes:
    - Fix potential NPE on removing uncached repository from cache
    - Ignore the default contents of .git/description file
    changes:
    - Personal repository prefix (~) is now configurable (issue-265)
    - Updated default binary and Lucene ignore extensions
src/main/java/com/gitblit/GitBlit.java
@@ -1990,8 +1990,10 @@
            if (getConfig(config,"description", null) == null) {
                File descFile = new File(r.getDirectory(), "description");
                if (descFile.exists()) {
                    config.setString(Constants.CONFIG_GITBLIT, null, "description",
                            com.gitblit.utils.FileUtils.readContent(descFile, System.getProperty("line.separator")));
                    String desc = com.gitblit.utils.FileUtils.readContent(descFile, System.getProperty("line.separator"));
                    if (!desc.toLowerCase().startsWith("unnamed repository")) {
                        config.setString(Constants.CONFIG_GITBLIT, null, "description", desc);
                    }
                }
            }
            model.description = getConfig(config, "description", "");