summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-24 01:33:57 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-24 01:33:57 -0800
commit4b953cdc04fec8783e2c654a671005492fda9b01 (patch)
treebb21980c582eab74ef84de98c698ad99ae0d1801
parent5ca5396c9ecba947c8faac7673195d309a6ba2ea (diff)
parenteb38cc689e84a8fd01c1856e889fe8d3b4f1bfb4 (diff)
downloadgit-4b953cdc04fec8783e2c654a671005492fda9b01.tar.gz
git-4b953cdc04fec8783e2c654a671005492fda9b01.zip
Merge fix bits from jc/rev-list
-rw-r--r--rev-list.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c
index 15894005c5..6cd83ed75b 100644
--- 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));
+ }
}
}