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 /revision.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 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 935e7a7ba4..39cc6b0eab 100644 --- a/revision.c +++ b/revision.c @@ -1781,7 +1781,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s * but the latter we have checked in the main loop. */ for (j = i; j < argc; j++) - verify_filename(revs->prefix, argv[j]); + verify_filename(revs->prefix, argv[j], j == i); append_prune_data(&prune_data, argv + i); break; |