Merge branch 'jc/gitweb-fix-cloud-tag'

diff --git a/builtin-log.c b/builtin-log.c
index 794821f6bca6500cbb040403c1350932ae7126fb..a0944f70a4a3aa4f5fb08c4ac4ae7dc31d25d532 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -426,7 +426,7 @@ static int istitlechar(char c)
 
 static const char *fmt_patch_suffix = ".patch";
 static int numbered = 0;
-static int auto_number = 0;
+static int auto_number = 1;
 
 static char **extra_hdr;
 static int extra_hdr_nr;
@@ -485,6 +485,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
                        return 0;
                }
                numbered = git_config_bool(var, value);
+               auto_number = auto_number && numbered;
                return 0;
        }