diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-11 21:45:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 21:45:49 +0200 |
| commit | 9ca724933a8d50633699acf3e5731fa392e2ff36 (patch) | |
| tree | 3aacdf358feb1e0bf564b8e0a62c31b8231c8d8e /builtin/grep.c | |
| parent | Merge branch 'cn/cherry-pick-range-docs' into maint (diff) | |
| parent | verify_filename(): ask the caller to chose the kind of diagnosis (diff) | |
| download | git-9ca724933a8d50633699acf3e5731fa392e2ff36.tar.xz git-9ca724933a8d50633699acf3e5731fa392e2ff36.zip | |
Merge branch 'mm/verify-filename-fix' into maint
"git diff COPYING HEAD:COPYING" gave a nonsense error message that
claimed that the treeish HEAD did not have COPYING in it.
* mm/verify-filename-fix:
verify_filename(): ask the caller to chose the kind of diagnosis
sha1_name: do not trigger detailed diagnosis for file arguments
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); |