diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-30 13:34:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-30 13:34:52 -0700 |
| commit | 3fe5dbf57f2512d29cb72c68bdab98957fda7bb3 (patch) | |
| tree | 7fd683371f8812f08e5384f55dcadf099e90f3c4 /builtin-diff.c | |
| parent | 522a98caa5b9b6b99e08c6c72665d59342d6d5e2 (diff) | |
| parent | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (diff) | |
| download | git-3fe5dbf57f2512d29cb72c68bdab98957fda7bb3.tar.gz | |
Merge branch '__/setup-n-mv'
* __/setup-n-mv:
Call setup_git_directory() much earlier
Call setup_git_directory() early
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index dca223235d..48d2fd03b7 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -221,7 +221,7 @@ 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; @@ -250,9 +250,8 @@ int cmd_diff(int argc, const char **argv, char **envp) * Other cases are errors. */ - init_revisions(&rev); git_config(git_diff_ui_config); - diff_setup(&rev.diffopt); + init_revisions(&rev, prefix); argc = setup_revisions(argc, argv, &rev, NULL); if (!rev.diffopt.output_format) { |