diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:21 +0300 |
| commit | 0100103d8e055891e820f78038ee40f2e8913854 (patch) | |
| tree | 962c31848b4a2d3fbbf32c29c11fcf36299aec33 /builtin | |
| parent | 05ed24dc51700bc3a08d0778b7c5c7c342be8caf (diff) | |
| parent | 29c83fc23f140c6d06e13916f40e6830616cfa29 (diff) | |
Merge branch 'jk/trailers-use-config' into maint
"git interpret-trailers" always treated '#' as the comment
character, regardless of core.commentChar setting, which has been
corrected.
* jk/trailers-use-config:
interpret-trailers: load default config
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/interpret-trailers.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index 8ae40dec47..f101d092b8 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -10,6 +10,7 @@ #include "parse-options.h" #include "string-list.h" #include "trailer.h" +#include "config.h" static const char * const git_interpret_trailers_usage[] = { N_("git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"), @@ -112,6 +113,8 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix) OPT_END() }; + git_config(git_default_config, NULL); + argc = parse_options(argc, argv, prefix, options, git_interpret_trailers_usage, 0); |