path: root/builtin-diff.c
diff options
authorLinus Torvalds <>2006-07-29 04:21:48 (GMT)
committerJunio C Hamano <>2006-07-29 05:03:06 (GMT)
commitdb6296a566eb1a8007a84330a911b38055720743 (patch)
treeb37108730d738e64c27311785598a55746c50081 /builtin-diff.c
parent818f477c40fee62ab8ea5b493c51bb357f38957c (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin-diff.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index dca2232..45b27cf 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -227,7 +227,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
struct rev_info rev;
struct object_array_entry ent[100];
int ents = 0, blobs = 0, paths = 0;
- const char *path = NULL;
+ const char *path = NULL, *prefix;
struct blobinfo blob[2];
@@ -250,9 +250,9 @@ int cmd_diff(int argc, const char **argv, char **envp)
* Other cases are errors.
- init_revisions(&rev);
+ prefix = setup_git_directory();
- diff_setup(&rev.diffopt);
+ init_revisions(&rev, prefix);
argc = setup_revisions(argc, argv, &rev, NULL);
if (!rev.diffopt.output_format) {