Skip to content

Commit

Permalink
Revert 8849442 (removal of duplicate parents in the output codepath)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jul 9, 2007
1 parent 11d6596 commit 1ed8415
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions builtin-rev-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ');
Expand Down

0 comments on commit 1ed8415

Please sign in to comment.