diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-10-13 22:54:25 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-10-14 16:52:09 -0700 |
| commit | 4e6d4bc0f0f1388dfcad2af4804b35289ed4ec92 (patch) | |
| tree | 3bee459d407edb0e5ec41305d1f31670177fdade /t | |
| parent | Update draft release notes to 1.6.0.3 (diff) | |
| download | tgif-4e6d4bc0f0f1388dfcad2af4804b35289ed4ec92.tar.xz | |
Add testcase to ensure merging an early part of a branch is done properly
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 94bc556cb2..5abce3119b 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -507,4 +507,30 @@ test_expect_success 'in-index merge' ' test_debug 'gitk --all' +cat >expected <<EOF +Merge branch 'c5' (early part) +EOF + +test_expect_success 'merge early part of c2' ' + git reset --hard c3 && + echo c4 > c4.c && + git add c4.c && + git commit -m c4 && + git tag c4 && + echo c5 > c5.c && + git add c5.c && + git commit -m c5 && + git tag c5 && + git reset --hard c3 && + echo c6 > c6.c && + git add c6.c && + git commit -m c6 && + git tag c6 && + git merge c5~1 && + git show -s --pretty=format:%s HEAD > actual && + test_cmp actual expected +' + +test_debug 'gitk --all' + test_done |