diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:40 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:40 +0300 |
| commit | 3a506079d2f3375dd1f4bbd0fe3793dd74fb7d2d (patch) | |
| tree | 8c0dd95317c45fee457103c4ecf590cddc17bba0 /builtin | |
| parent | a56a7777bdf7a812fafb45663db26c5f4d988e52 (diff) | |
| parent | 29c83fc23f140c6d06e13916f40e6830616cfa29 (diff) | |
Merge branch 'jk/trailers-use-config'
"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); |