aboutsummaryrefslogtreecommitdiff
path: root/show-branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-09 14:41:39 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-09 14:41:39 -0800
commitce1610ead63221738225c415300f3d32620ced04 (patch)
tree88de99ec7d616a45bb2bc16cc86ed9a0fd78a2d4 /show-branch.c
parent147cf31738e5e66aa304897ede6b556d4e204967 (diff)
downloadgit-ce1610ead63221738225c415300f3d32620ced04.tar.gz
git-ce1610ead63221738225c415300f3d32620ced04.tar.xz
call git_config() after setup_git_directory()
If you call setup_git_directory() to work from a subdirectory, that should be run first before running git_config(). Otherwise you would not read the configuration file from the correct place. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'show-branch.c')
-rw-r--r--show-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/show-branch.c b/show-branch.c
index ffe7456a6..511fd3b65 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -548,8 +548,8 @@ int main(int ac, char **av)
int with_current_branch = 0;
int head_at = -1;
- git_config(git_show_branch_config);
setup_git_directory();
+ git_config(git_show_branch_config);
/* If nothing is specified, try the default first */
if (ac == 1 && default_num) {