diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-07-08 19:05:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-08 23:18:22 -0700 |
| commit | 1ed84157a21a3e868228b15588e4aadfbe5a030b (patch) | |
| tree | 282ae0b6a480f83e5a14d1d3078b292f302a8aca | |
| parent | revision.c: remove duplicated parents after history simplification (diff) | |
| download | tgif-1ed84157a21a3e868228b15588e4aadfbe5a030b.tar.xz | |
Revert 88494423 (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>
| -rw-r--r-- | builtin-rev-list.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 86db8b03fe..8efd609b12 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -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(' '); |