diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-06-27 16:22:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 05:45:51 (GMT) |
| commit | f4022fa33f1b0a63029d1bc3748f01f720151218 (patch) | |
| tree | a708013acc30f25b2d64bb057b562c3ab59c4572 /archive.c | |
| parent | 98cf9c3bd7504d36e6049939bf9cc624f2cf5b9f (diff) | |
| download | git-f4022fa33f1b0a63029d1bc3748f01f720151218.zip git-f4022fa33f1b0a63029d1bc3748f01f720151218.tar.gz git-f4022fa33f1b0a63029d1bc3748f01f720151218.tar.bz2 | |
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>
Diffstat (limited to 'archive.c')
0 files changed, 0 insertions, 0 deletions