diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-04 00:34:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-04 00:34:39 -0800 |
| commit | 27b4070e40a771c41ed581ef1ac98dd43e58ab87 (patch) | |
| tree | 084c3b9f77e5d9e8253a16e6f9baea5d25f77e46 /t | |
| parent | 4947cf9cc377b15006f3e649c59edf9bc813af6f (diff) | |
| parent | 52dce39762fbec75b2d561e5dedb25b8e51f83eb (diff) | |
| download | git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.gz git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.xz | |
Merge branch 'maint'
* maint:
Fix 'git remote show' regression on empty repository in 1.5.4
Fix incorrect wording in git-merge.txt.
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
Fix random crashes in http_cleanup()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 50c51c82f..5d166280c 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -419,6 +419,7 @@ test_debug 'gitk --all' test_expect_success 'merge c0 with c1 (no-ff)' ' git reset --hard c0 && + git config branch.master.mergeoptions "" && test_tick && git merge --no-ff c1 && verify_merge file result.1 && @@ -427,6 +428,11 @@ test_expect_success 'merge c0 with c1 (no-ff)' ' test_debug 'gitk --all' +test_expect_success 'combining --squash and --no-ff is refused' ' + test_must_fail git merge --squash --no-ff c1 && + test_must_fail git merge --no-ff --squash c1 +' + test_expect_success 'merge c0 with c1 (ff overrides no-ff)' ' git reset --hard c0 && git config branch.master.mergeoptions "--no-ff" && |