summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-09 22:41:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-09 22:41:39 (GMT)
commitce1610ead63221738225c415300f3d32620ced04 (patch)
tree88de99ec7d616a45bb2bc16cc86ed9a0fd78a2d4
parent147cf31738e5e66aa304897ede6b556d4e204967 (diff)
downloadgit-ce1610ead63221738225c415300f3d32620ced04.zip
git-ce1610ead63221738225c415300f3d32620ced04.tar.gz
git-ce1610ead63221738225c415300f3d32620ced04.tar.bz2
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>
-rw-r--r--commit-tree.c4
-rw-r--r--show-branch.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/commit-tree.c b/commit-tree.c
index 4634b50..b1c8dca 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -86,13 +86,13 @@ int main(int argc, char **argv)
unsigned int size;
setup_ident();
+ setup_git_directory();
+
git_config(git_default_config);
if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
usage(commit_tree_usage);
- setup_git_directory();
-
check_valid(tree_sha1, "tree");
for (i = 2; i < argc; i += 2) {
char *a, *b;
diff --git a/show-branch.c b/show-branch.c
index ffe7456..511fd3b 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) {