summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-07-29 05:44:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-29 08:34:07 (GMT)
commita633fca0c056aa221d23493c276d3713191621b3 (patch)
tree6dcb10b511201ad3e83f736e7eba214e301e5805 /builtin-diff.c
parentdb6296a566eb1a8007a84330a911b38055720743 (diff)
downloadgit-a633fca0c056aa221d23493c276d3713191621b3.zip
git-a633fca0c056aa221d23493c276d3713191621b3.tar.gz
git-a633fca0c056aa221d23493c276d3713191621b3.tar.bz2
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-diff.c')
-rw-r--r--builtin-diff.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index 45b27cf..48d2fd0 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -221,13 +221,13 @@ void add_head(struct rev_info *revs)
add_pending_object(revs, obj, "HEAD");
}
-int cmd_diff(int argc, const char **argv, char **envp)
+int cmd_diff(int argc, const char **argv, const char *prefix)
{
int i;
struct rev_info rev;
struct object_array_entry ent[100];
int ents = 0, blobs = 0, paths = 0;
- const char *path = NULL, *prefix;
+ const char *path = NULL;
struct blobinfo blob[2];
/*
@@ -250,7 +250,6 @@ int cmd_diff(int argc, const char **argv, char **envp)
* Other cases are errors.
*/
- prefix = setup_git_directory();
git_config(git_diff_ui_config);
init_revisions(&rev, prefix);