Merge branch 'ew/maint-svn-cert-fileprovider' into maint

diff --git a/builtin-gc.c b/builtin-gc.c
index 799c263936d19ef8e66b21f83a370c4fcfe9e5f5..ad4a75eedddb1dfc0ecef2b536727970335673f9 100644 (file)
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -37,7 +37,7 @@ static const char *argv_rerere[] = {"rerere", "gc", NULL};
 static int gc_config(const char *var, const char *value)
 {
        if (!strcmp(var, "gc.packrefs")) {
-               if (!strcmp(value, "notbare"))
+               if (value && !strcmp(value, "notbare"))
                        pack_refs = -1;
                else
                        pack_refs = git_config_bool(var, value);
@@ -205,7 +205,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                prune = 0;
                if (!need_to_gc())
                        return 0;
-               fprintf(stderr, "Packing your repository for optimum "
+               fprintf(stderr, "Auto packing your repository for optimum "
                        "performance. You may also\n"
                        "run \"git gc\" manually. See "
                        "\"git help gc\" for more information.\n");