diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-29 00:19:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-29 00:19:32 +0200 |
| commit | 08080894b7bd68db413275e601286d94b40752bd (patch) | |
| tree | 4541a9e47013b90380d18111c97df65d138aaf8b /builtin/grep.c | |
| parent | Merge branch 'jk/diff-no-index-pager' (diff) | |
| parent | verify_filename(): ask the caller to chose the kind of diagnosis (diff) | |
| download | git-08080894b7bd68db413275e601286d94b40752bd.tar.xz git-08080894b7bd68db413275e601286d94b40752bd.zip | |
Merge branch 'mm/verify-filename-fix'
"git diff COPYING HEAD:COPYING" gave a nonsense error message that
claimed that the treeish HEAD did not have COPYING in it.
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index fe1726f5ef..29adb0ac93 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -928,7 +928,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) if (!seen_dashdash) { int j; for (j = i; j < argc; j++) - verify_filename(prefix, argv[j]); + verify_filename(prefix, argv[j], j == i); } paths = get_pathspec(prefix, argv + i); |