]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Revert 88494423 (removal of duplicate parents in the output codepath)
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2007 02:05:31 +0000 (19:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2007 06:18:22 +0000 (23:18 -0700)
Now this is not needed, as we rewrite the parent list in the commit
object itself.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-rev-list.c

index 86db8b03fe4295497cf011a75617d6dc8f172c64..8efd609b12e3c8cf20fbe1bf5c0d55643d34ea3c 100644 (file)
@@ -70,21 +70,9 @@ static void show_commit(struct commit *commit)
        if (revs.parents) {
                struct commit_list *parents = commit->parents;
                while (parents) {
-                       struct object *o = &(parents->item->object);
+                       printf(" %s", sha1_to_hex(parents->item->object.sha1));
                        parents = parents->next;
-                       if (o->flags & TMP_MARK)
-                               continue;
-                       printf(" %s", sha1_to_hex(o->sha1));
-                       o->flags |= TMP_MARK;
                }
-               /* TMP_MARK is a general purpose flag that can
-                * be used locally, but the user should clean
-                * things up after it is done with them.
-                */
-               for (parents = commit->parents;
-                    parents;
-                    parents = parents->next)
-                       parents->item->object.flags &= ~TMP_MARK;
        }
        if (revs.commit_format == CMIT_FMT_ONELINE)
                putchar(' ');