X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=4381d455e4579fb2c6c598cee5e9252277590b28;hb=0fe7c1de16f71312e6adac4b85bddf0d62a47168;hp=f9c7d15f56ded660e8cc58ca533786fff16c5429;hpb=c6df547a415e4e34165df3d4af40f3eb2cb1cf4f;p=git.git

diff --git a/revision.c b/revision.c
index f9c7d15f..4381d455 100644
--- a/revision.c
+++ b/revision.c
@@ -664,6 +664,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 			}
 			if (!strcmp(arg, "-c")) {
 				revs->diff = 1;
+				revs->dense_combined_merges = 0;
 				revs->combine_merges = 1;
 				continue;
 			}
@@ -752,17 +753,15 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 			arg++;
 		}
 		if (get_sha1(arg, sha1) < 0) {
-			struct stat st;
 			int j;
 
 			if (seen_dashdash || local_flags)
 				die("bad revision '%s'", arg);
 
 			/* If we didn't have a "--", all filenames must exist */
-			for (j = i; j < argc; j++) {
-				if (lstat(argv[j], &st) < 0)
-					die("'%s': %s", argv[j], strerror(errno));
-			}
+			for (j = i; j < argc; j++)
+				verify_filename(revs->prefix, argv[j]);
+
 			revs->prune_data = get_pathspec(revs->prefix, argv + i);
 			break;
 		}