Re: [PATCH] Fix "git log --parent -m" from emitting duplicated parent info
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:20
Sorry, not 88494239 but this one.
commit 884944239f2ab673cedfaa5e7999d31fd6a46331
Author: Junio C Hamano [off-list ref]
Date: Sun Jan 29 15:24:42 2006 -0800
rev-list: omit duplicated parents.
Showing the same parent more than once for a commit does not
make much sense downstream, so stop it.
This can happen with an incorrectly made merge commit that
merges the same parent twice, but can happen in an otherwise
sane development history while squishing the history by taking
into account only commits that touch specified paths.
For example,
$ git rev-list --max-count=1 --parents addafaf -- rev-list.c
would have to show this commit ancestry graph:
.---o---.
/ \
.---*---o---.
/ 93b74bc \
---*---o---o-----o---o-----o addafaf
d8f6b34 \ /
.---o---o---.
\ /
.---*---.
3815f42
where 5 independent development tracks, only two of which have
changes in the specified paths since they forked. The last
change for the other three development tracks was done by the
same commit before they forked, and we were showing that three
times.
Signed-off-by: Junio C Hamano [off-list ref]