@matheusbsbs / matheus-bagliano / commits / e1abc69b72
Fork 0

Fix up duplicate parents removal

This removes duplicate parents properly, making gitk happy again. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Torvalds committed Jul 20, 2007 at 23:11 UTC e1abc69b72401c5b2eb0e402e0fe10e8e0e5db27
1 file changed +6 -5
revision.c
+6 -5
@@ -1323,16 +1323,17 @@ static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp
1323
1324 static void remove_duplicate_parents(struct commit *commit)
1325 {
1326 - struct commit_list *p;
1327 - struct commit_list **pp = &commit->parents;
1326 + struct commit_list **pp, *p;
1327
1328 /* Examine existing parents while marking ones we have seen... */
1330 - for (p = commit->parents; p; p = p->next) {
1329 + pp = &commit->parents;
1330 + while ((p = *pp) != NULL) {
1331 struct commit *parent = p->item;
1332 - if (parent->object.flags & TMP_MARK)
1332 + if (parent->object.flags & TMP_MARK) {
1333 + *pp = p->next;
1334 continue;
1335 + }
1336 parent->object.flags |= TMP_MARK;
1335 - *pp = p;
1337 pp = &p->next;
1338 }
1339 /* ... and clear the temporary mark */