Merge branch 'jc/check-attr-honor-working-tree'

diff --git a/revision.c b/revision.c
index 61be08754af91a32f9c7729f2e5223c592faf451..bd027bc0152a59ac0c4584ab752ff70bee5abbfa 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -774,6 +774,10 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
                return 0;
        commit->object.flags |= ADDED;
 
+       if (revs->include_check &&
+           !revs->include_check(commit, revs->include_check_data))
+               return 0;
+
        /*
         * If the commit is uninteresting, don't try to
         * prune parents - we want the maximal uninteresting