summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-11 19:45:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-11 19:45:49 (GMT)
commit9ca724933a8d50633699acf3e5731fa392e2ff36 (patch)
tree3aacdf358feb1e0bf564b8e0a62c31b8231c8d8e /revision.c
parenta0ceb72f38bf841322fc8ce28ea39328e8a5aa19 (diff)
parent023e37c37780d6a56f2870a979c8eb3a9ee9a44d (diff)
downloadgit-9ca724933a8d50633699acf3e5731fa392e2ff36.zip
git-9ca724933a8d50633699acf3e5731fa392e2ff36.tar.gz
git-9ca724933a8d50633699acf3e5731fa392e2ff36.tar.bz2
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 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 935e7a7..39cc6b0 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;