git-status: respect core.excludesFile

diff --git a/revision.c b/revision.c
index adc381c268b6f336ab7820c464fafa39629c8e28..486393cb0835ce70f685d665b916e1b67974f184 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -360,6 +360,7 @@ static void add_parents_to_list(struct rev_info *revs, struct commit *commit, st
 {
        struct commit_list *parent = commit->parents;
        unsigned left_flag;
+       int add, rest;
 
        if (commit->object.flags & ADDED)
                return;
@@ -405,18 +406,19 @@ static void add_parents_to_list(struct rev_info *revs, struct commit *commit, st
                return;
 
        left_flag = (commit->object.flags & SYMMETRIC_LEFT);
-       parent = commit->parents;
-       while (parent) {
+
+       rest = !revs->first_parent_only;
+       for (parent = commit->parents, add = 1; parent; add = rest) {
                struct commit *p = parent->item;
 
                parent = parent->next;
-
                parse_commit(p);
                p->object.flags |= left_flag;
                if (p->object.flags & SEEN)
                        continue;
                p->object.flags |= SEEN;
-               insert_by_date(p, list);
+               if (add)
+                       insert_by_date(p, list);
        }
 }
 
@@ -484,7 +486,7 @@ static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
                        add_pending_object(cb->all_revs, o, "");
                }
                else if (!cb->warned_bad_reflog) {
-                       warn("reflog of '%s' references pruned commits",
+                       warning("reflog of '%s' references pruned commits",
                                cb->name_for_errormsg);
                        cb->warned_bad_reflog = 1;
                }
@@ -847,6 +849,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                handle_all(revs, flags);
                                continue;
                        }
+                       if (!strcmp(arg, "--first-parent")) {
+                               revs->first_parent_only = 1;
+                               continue;
+                       }
                        if (!strcmp(arg, "--reflog")) {
                                handle_reflog(revs, flags);
                                continue;