summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:57:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:57:14 -0700
commited0006aa93bd12149a19b93fa7d3bfc15be36cfd (patch)
tree283850b21d77c35da32872e6abc0dfc39b94298e /builtin
parentMerge branch 'jk/ident-ai-canonname-could-be-null' (diff)
parentworktree: honor configuration variables (diff)
downloadtgif-ed0006aa93bd12149a19b93fa7d3bfc15be36cfd.tar.xz
Merge branch 'jc/worktree-config'
"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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/worktree.c2
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)