diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:21:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:21:17 -0700 |
| commit | fdb70b16a006f82b65fb92995886a074c829f587 (patch) | |
| tree | c13700374eccda4783aefbab2b1c6e54addf90f3 | |
| parent | f7f0a87e0a27a1baaf782af7cec18fd23fdf35de (diff) | |
| parent | d49028e6e7ad02a0fc2622487abc46312d9b42f4 (diff) | |
| download | git-fdb70b16a006f82b65fb92995886a074c829f587.tar.gz | |
Merge branch 'jc/worktree-config' into maint
"git worktree", even though it used the default_abbrev setting that
ought to be affected by core.abbrev configuration variable, ignored
the variable setting. The command has been taught to read the
default set of configuration variables to correct this.
* jc/worktree-config:
worktree: honor configuration variables
| -rw-r--r-- | builtin/worktree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 6dcf7bd9d2..5c4854d3e4 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -528,6 +528,8 @@ int cmd_worktree(int ac, const char **av, const char *prefix) OPT_END() }; + git_config(git_default_config, NULL); + if (ac < 2) usage_with_options(worktree_usage, options); if (!prefix) |