aboutsummaryrefslogtreecommitdiff
path: root/builtin/rev-parse.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-28 15:19:31 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-28 15:19:32 -0700
commit08080894b7bd68db413275e601286d94b40752bd (patch)
tree4541a9e47013b90380d18111c97df65d138aaf8b /builtin/rev-parse.c
parentdefd7aa34c81148904ed5d22d975b5b3c843e040 (diff)
parent023e37c37780d6a56f2870a979c8eb3a9ee9a44d (diff)
downloadgit-08080894b7bd68db413275e601286d94b40752bd.tar.gz
git-08080894b7bd68db413275e601286d94b40752bd.tar.xz
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/rev-parse.c')
-rw-r--r--builtin/rev-parse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 733f626f6..13495b88f 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -486,7 +486,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
if (as_is) {
if (show_file(arg) && as_is < 2)
- verify_filename(prefix, arg);
+ verify_filename(prefix, arg, 0);
continue;
}
if (!strcmp(arg,"-n")) {
@@ -734,7 +734,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
as_is = 1;
if (!show_file(arg))
continue;
- verify_filename(prefix, arg);
+ verify_filename(prefix, arg, 1);
}
if (verify) {
if (revs_count == 1) {