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-grep.c | |
| parent | Merge branch 'js/mv' (diff) | |
| parent | Merge branch 'lt/setup' into __/setup-n-mv (diff) | |
| download | tgif-3fe5dbf57f2512d29cb72c68bdab98957fda7bb3.tar.xz | |
Merge branch '__/setup-n-mv'
* __/setup-n-mv:
Call setup_git_directory() much earlier
Call setup_git_directory() early
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index a79bac305a..69b7c4862a 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -919,14 +919,13 @@ static const char emsg_missing_context_len[] = static const char emsg_missing_argument[] = "option requires an argument -%s"; -int cmd_grep(int argc, const char **argv, char **envp) +int cmd_grep(int argc, const char **argv, const char *prefix) { int hit = 0; int cached = 0; int seen_dashdash = 0; struct grep_opt opt; struct object_array list = { 0, 0, NULL }; - const char *prefix = setup_git_directory(); const char **paths = NULL; int i; |