From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Sep 2016 06:49:39 +0000 (-0700)
Subject: worktree: honor configuration variables
X-Git-Tag: v2.10.2~29^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d49028e6e7ad02a0fc2622487abc46312d9b42f4;p=thirdparty%2Fgit.git

worktree: honor configuration variables

The command accesses default_abbrev (defined in environment.c and is
updated via core.abbrev configuration), but never makes any call to
git_config().  The output from "worktree list" ignores the abbrev
setting for this reason.

Make a call to git_config() to read the default set of configuration
variables at the beginning of the command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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)