summaryrefslogtreecommitdiff
path: root/t/t7603-merge-reduce-heads.sh
AgeCommit message (Collapse)AuthorFilesLines
2008-09-10t7603: add new testcases to ensure builtin-commit uses reduce_heads()Libravatar Miklos Vajna1-0/+53
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
Converts tests between t7201-t9001. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-30Add new test case to ensure git-merge reduces octopus parents when possibleLibravatar Miklos Vajna1-0/+63
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>