diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:21 -0700 |
| commit | 4f2d651e5b3414eac5d22ff47366d22c8cc289f6 (patch) | |
| tree | 1d6a6531fe0170679bfd193c4516e91c00cbb438 /t/t7600-merge.sh | |
| parent | ce6e5ff435f325769dd28980cf3c8b1625f194f2 (diff) | |
| parent | cf10f9fdd5e673a163847f0e931ce9731507e03b (diff) | |
| download | git-4f2d651e5b3414eac5d22ff47366d22c8cc289f6.tar.gz | |
Merge branch 'mv/merge-noff'
* mv/merge-noff:
builtin-commit: use reduce_heads() only when appropriate
Conflicts:
builtin-commit.c
t/t7600-merge.sh
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 3a36a95b9a..e5b210bc96 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -544,4 +544,20 @@ test_expect_success 'merge early part of c2' ' test_debug 'gitk --all' +test_expect_success 'merge --no-ff --no-commit && commit' ' + git reset --hard c0 && + git merge --no-ff --no-commit c1 && + EDITOR=: git commit && + verify_parents $c0 $c1 +' + +test_debug 'gitk --all' + +test_expect_success 'amending no-ff merge commit' ' + EDITOR=: git commit --amend && + verify_parents $c0 $c1 +' + +test_debug 'gitk --all' + test_done |