Merge fix bits from jc/rev-list

diff --git a/rev-list.c b/rev-list.c
index 15894005c5c0a8c722bf3511fd3c5a24973c4447..6cd83ed75bec8e0961ff99fa63f1f6b86fa6c336 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -440,8 +440,10 @@ static void mark_edge_parents_uninteresting(struct commit *commit)
                if (!(parent->object.flags & UNINTERESTING))
                        continue;
                mark_tree_uninteresting(parent->tree);
-               if (edge_hint)
+               if (edge_hint && !(parent->object.flags & SHOWN)) {
+                       parent->object.flags |= SHOWN;
                        printf("-%s\n", sha1_to_hex(parent->object.sha1));
+               }
        }
 }