projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 98cf9c3) | patch
Add new test case to ensure git-merge reduces octopus parents when possible
authorMiklos Vajna <vmiklos@frugalware.org>
Fri, 27 Jun 2008 16:22:06 +0000 (18:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 05:45:51 +0000 (22:45 -0700)
commitf4022fa33f1b0a63029d1bc3748f01f720151218
treea708013acc30f25b2d64bb057b562c3ab59c4572tree | snapshot
parent98cf9c3bd7504d36e6049939bf9cc624f2cf5b9fcommit | 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>
t/t7603-merge-reduce-heads.sh [new file with mode: 0755] blob
Git—the stupid content tracker