revision.c: don't show all merges for --parents
authorKevin Bracey <kevin@bracey.fi>
Thu, 16 May 2013 15:32:40 +0000 (18:32 +0300)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 May 2013 18:51:10 +0000 (11:51 -0700)
commitbf3418b08bac89902a5f6c70f8695f148df99828
tree6b2f5d7fec00f019abf2afea302f419477fe4fa6
parent4d826608e9610851d29440ca290e54b701921608
revision.c: don't show all merges for --parents

When using --parents or --children, get_commit_action() previously showed
all merges, even if TREESAME to both parents.

This was intended to tie together the topology of the rewritten parents,
but it was excessive - in fact we only need to show merges that have two
or more relevant parents. Merges at the boundary do not necessarily need
to be shown.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
revision.c
t/t6111-rev-list-treesame.sh