diff options
| author |  Jeff King <peff@peff.net> | 2017-07-13 11:07:14 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-07-13 12:42:51 -0700 |
| commit | d8b68686a4cc8a486823dd356ed4dba0e51536ea (patch) | |
| tree | 80f9bd455c299ad2847c83e9d32fe2c020dc3649 /builtin | |
| parent | color: check color.ui in git_default_config() (diff) | |
| download | tgif-d8b68686a4cc8a486823dd356ed4dba0e51536ea.tar.xz | |
for-each-ref: load config earlier
In most commands we load config before parsing command line
options, since it lets the latter override the former with a
simple variable assignment. In the case of for-each-ref,
though, we do it in the reverse order. This is OK with
the current code, since there's no interaction between the
config and command-line options.
However, as the ref-filter code starts to care about config
during verify_ref_format(), we'll want to make sure the
config is loaded. Let's bump the config to the usual spot
near the top of the function.
We can drop the comment there; it's impossible to keep a
"why we load the config" comment like this up to date with
every config option we might be interested in. And indeed,
it's already stale; we'd care about core.abbrev, for
instance, when %(objectname:short) is used.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/for-each-ref.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index f47066b42a..5d7c921a77 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -54,6 +54,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) format.format = "%(objectname) %(objecttype)\t%(refname)"; + git_config(git_default_config, NULL); + parse_options(argc, argv, prefix, opts, for_each_ref_usage, 0); if (maxcount < 0) { error("invalid --count argument: `%d'", maxcount); @@ -71,9 +73,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) sorting->ignore_case = icase; filter.ignore_case = icase; - /* for warn_ambiguous_refs */ - git_config(git_default_config, NULL); - filter.name_patterns = argv; filter.match_as_path = 1; filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN); |