diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-07-28 22:44:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:34:07 -0700 |
| commit | a633fca0c056aa221d23493c276d3713191621b3 (patch) | |
| tree | 6dcb10b511201ad3e83f736e7eba214e301e5805 /builtin-fmt-merge-msg.c | |
| parent | db6296a566eb1a8007a84330a911b38055720743 (diff) | |
| download | git-a633fca0c056aa221d23493c276d3713191621b3.tar.gz git-a633fca0c056aa221d23493c276d3713191621b3.tar.xz | |
Call setup_git_directory() much earlier
This changes the calling convention of built-in commands and
passes the "prefix" (i.e. pathname of $PWD relative to the
project root level) down to them.
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index 338f2094f..c84224ee8 100644 --- a/builtin-fmt-merge-msg.c +++ b/builtin-fmt-merge-msg.c @@ -242,7 +242,7 @@ static void shortlog(const char *name, unsigned char *sha1, free_list(&subjects); } -int cmd_fmt_merge_msg(int argc, char **argv, char **envp) +int cmd_fmt_merge_msg(int argc, char **argv, const char *prefix) { int limit = 20, i = 0; char line[1024]; @@ -250,7 +250,6 @@ 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); |