Skip to content

Commit 1ed8415

Browse files
committed
Revert 8849442 (removal of duplicate parents in the output codepath)
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>
1 parent 11d6596 commit 1ed8415

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

builtin-rev-list.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,9 @@ static void show_commit(struct commit *commit)
7070
if (revs.parents) {
7171
struct commit_list *parents = commit->parents;
7272
while (parents) {
73-
struct object *o = &(parents->item->object);
73+
printf(" %s", sha1_to_hex(parents->item->object.sha1));
7474
parents = parents->next;
75-
if (o->flags & TMP_MARK)
76-
continue;
77-
printf(" %s", sha1_to_hex(o->sha1));
78-
o->flags |= TMP_MARK;
7975
}
80-
/* TMP_MARK is a general purpose flag that can
81-
* be used locally, but the user should clean
82-
* things up after it is done with them.
83-
*/
84-
for (parents = commit->parents;
85-
parents;
86-
parents = parents->next)
87-
parents->item->object.flags &= ~TMP_MARK;
8876
}
8977
if (revs.commit_format == CMIT_FMT_ONELINE)
9078
putchar(' ');

0 commit comments

Comments
 (0)