![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Fri, 27 Jun 2008 16:22:06 +0000 (18:22 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Jul 2008 05:45:51 +0000 (22:45 -0700) | ||
| commit | f4022fa33f1b0a63029d1bc3748f01f720151218 | |
| tree | a708013acc30f25b2d64bb057b562c3ab59c4572 | tree | snapshot |
| parent | 98cf9c3bd7504d36e6049939bf9cc624f2cf5b9f | commit | diff |
Add new test case to ensure git-merge reduces octopus parents when possible
The old shell version used show-branch --independent to filter for the
ones that cannot be reached from any other reference.
The new C version uses reduce_heads() from commit.c for this, so
add test to ensure it works as expected.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The old shell version used show-branch --independent to filter for the
ones that cannot be reached from any other reference.
The new C version uses reduce_heads() from commit.c for this, so
add test to ensure it works as expected.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7603-merge-reduce-heads.sh | [new file with mode: 0755] | blob |