X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.c;h=d7678cfab4b18082bacee706cb119018b39643a0;hb=5cdeae71ea7330c08cf96b581e2c7696949e3840;hp=12cd0529a5dfac9af01af0f47e895e9cf142c42a;hpb=d3c4519a726f1cfcb0c96ba71e4f3208b47fed88;p=git.git

diff --git a/revision.c b/revision.c
index 12cd0529..d7678cfa 100644
--- a/revision.c
+++ b/revision.c
@@ -587,7 +587,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 				revs->remove_empty_trees = 1;
 				continue;
 			}
-			if (!strncmp(arg, "--no-merges", 11)) {
+			if (!strcmp(arg, "--no-merges")) {
 				revs->no_merges = 1;
 				continue;
 			}
@@ -649,7 +649,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 			/* 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", arg, strerror(errno));
+					die("'%s': %s", argv[j], strerror(errno));
 			}
 			revs->prune_data = get_pathspec(revs->prefix, argv + i);
 			break;