diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:42 -0700 |
commit | e91f65d0e28b9f4dce85f82c5e3e208a54171a14 (patch) | |
tree | a32d8e65d3ed94ea0dc7bbfddd21dba832e80253 /builtin/log.c | |
parent | Merge branch 'nd/merge-quit' (diff) | |
parent | format-patch: teach format.notes config option (diff) | |
download | tgif-e91f65d0e28b9f4dce85f82c5e3e208a54171a14.tar.xz |
Merge branch 'dl/format-patch-notes-config'
"git format-patch" learns a configuration to set the default for
its --notes=<ref> option.
* dl/format-patch-notes-config:
format-patch: teach format.notes config option
git-format-patch.txt: document --no-notes option
Diffstat (limited to 'builtin/log.c')
-rw-r--r-- | builtin/log.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 147850dc73..7c8767d3bc 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -779,6 +779,8 @@ enum { static int git_format_config(const char *var, const char *value, void *cb) { + struct rev_info *rev = cb; + if (!strcmp(var, "format.headers")) { if (!value) die(_("format.headers without value")); @@ -864,6 +866,22 @@ static int git_format_config(const char *var, const char *value, void *cb) from = NULL; return 0; } + if (!strcmp(var, "format.notes")) { + struct strbuf buf = STRBUF_INIT; + int b = git_parse_maybe_bool(value); + if (!b) + return 0; + rev->show_notes = 1; + if (b < 0) { + strbuf_addstr(&buf, value); + expand_notes_ref(&buf); + string_list_append(&rev->notes_opt.extra_notes_refs, + strbuf_detach(&buf, NULL)); + } else { + rev->notes_opt.use_default_notes = 1; + } + return 0; + } return git_log_config(var, value, cb); } @@ -1617,8 +1635,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) extra_to.strdup_strings = 1; extra_cc.strdup_strings = 1; init_log_defaults(); - git_config(git_format_config, NULL); repo_init_revisions(the_repository, &rev, prefix); + git_config(git_format_config, &rev); rev.commit_format = CMIT_FMT_EMAIL; rev.expand_tabs_in_log_default = 0; rev.verbose_header = 1; |