rev-list --no-merges: argument parsing fix.

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 12cd052..d7678cf 100644 (file)
--- 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;