summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-07-29 04:21:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-29 05:03:06 (GMT)
commitdb6296a566eb1a8007a84330a911b38055720743 (patch)
treeb37108730d738e64c27311785598a55746c50081 /builtin-fmt-merge-msg.c
parent818f477c40fee62ab8ea5b493c51bb357f38957c (diff)
downloadgit-db6296a566eb1a8007a84330a911b38055720743.zip
git-db6296a566eb1a8007a84330a911b38055720743.tar.gz
git-db6296a566eb1a8007a84330a911b38055720743.tar.bz2
Call setup_git_directory() early
Any git command that expects to work in a subdirectory of a project, and that reads the git config files (which is just about all of them) needs to make sure that it does the "setup_git_directory()" call before it tries to read the config file. This means, among other things, that we need to move the call out of "init_revisions()", and into the caller. This does the mostly trivial conversion to do that. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
-rw-r--r--builtin-fmt-merge-msg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index f20b27b..338f209 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -250,6 +250,7 @@ int cmd_fmt_merge_msg(int argc, char **argv, char **envp)
const char *sep = "";
unsigned char head_sha1[20];
const char *head, *current_branch;
+ const char *prefix = setup_git_directory();
git_config(fmt_merge_msg_config);
@@ -342,7 +343,7 @@ int cmd_fmt_merge_msg(int argc, char **argv, char **envp)
struct rev_info rev;
head = lookup_commit(head_sha1);
- init_revisions(&rev);
+ init_revisions(&rev, prefix);
rev.commit_format = CMIT_FMT_ONELINE;
rev.ignore_merges = 1;
rev.limited = 1;