diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2007-11-03 23:38:24 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:26:30 -0800 |
| commit | 49604a4d62d9055dbfc06472e7ef20d8a6114123 (patch) | |
| tree | 04184f6985f3b22bab7f22fe96d25b23e5dee4ce /builtin-log.c | |
| parent | 140dd77a5cb2e61dcb942e245a2474fae95e42a5 (diff) | |
| download | git-49604a4d62d9055dbfc06472e7ef20d8a6114123.tar.gz git-49604a4d62d9055dbfc06472e7ef20d8a6114123.tar.xz | |
format-patch: Add configuration and off switch for --numbered
format.numbered is a tri-state variable. Boolean values enable or
disable numbering by default and "auto" enables number when outputting
more than one patch.
--no-numbered (short: -N) will disable numbering.
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c index 8b2bf632c..c5230106a 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -273,6 +273,8 @@ static int istitlechar(char c) static char *extra_headers = NULL; static int extra_headers_size = 0; static const char *fmt_patch_suffix = ".patch"; +static int numbered = 0; +static int auto_number = 0; static int git_format_config(const char *var, const char *value) { @@ -297,6 +299,15 @@ static int git_format_config(const char *var, const char *value) if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { return 0; } + if (!strcmp(var, "format.numbered")) { + if (!strcasecmp(value, "auto")) { + auto_number = 1; + return 0; + } + + numbered = git_config_bool(var, value); + return 0; + } return git_log_config(var, value); } @@ -466,7 +477,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) struct rev_info rev; int nr = 0, total, i, j; int use_stdout = 0; - int numbered = 0; int start_number = -1; int keep_subject = 0; int numbered_files = 0; /* _just_ numbers */ @@ -503,6 +513,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[i], "-n") || !strcmp(argv[i], "--numbered")) numbered = 1; + else if (!strcmp(argv[i], "-N") || + !strcmp(argv[i], "--no-numbered")) { + numbered = 0; + auto_number = 0; + } else if (!prefixcmp(argv[i], "--start-number=")) start_number = strtol(argv[i] + 15, NULL, 10); else if (!strcmp(argv[i], "--numbered-files")) @@ -642,6 +657,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) list[nr - 1] = commit; } total = nr; + if (!keep_subject && auto_number && total > 1) + numbered = 1; if (numbered) rev.total = total + start_number - 1; rev.add_signoff = add_signoff; |