ls-files: --others should not say unmerged paths are unknown.

diff --git a/show-branch.c b/show-branch.c
index bb14c8677ab840ab414ace1af5d05f30ad23a5f5..70120005be00bb38feb6d56740a9340f2f353373 100644 (file)
--- a/show-branch.c
+++ b/show-branch.c
@@ -260,7 +260,7 @@ static int append_ref(const char *refname, const unsigned char *sha1)
        struct commit *commit = lookup_commit_reference_gently(sha1, 1);
        if (!commit)
                return 0;
-       if (MAX_REVS < ref_name_cnt) {
+       if (MAX_REVS <= ref_name_cnt) {
                fprintf(stderr, "warning: ignoring %s; "
                        "cannot handle more than %d refs",
                        refname, MAX_REVS);