diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 21:27:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 21:27:10 (GMT) |
| commit | 33f2790ecafd29b8551a290e566003b975807c61 (patch) | |
| tree | 1fb01d503bc1847a14b4e21cb5cb0a010f9c84ae /t | |
| parent | abbd50428e1215933f83a458f2842f5a6e0a21ee (diff) | |
| parent | 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2 (diff) | |
| download | git-33f2790ecafd29b8551a290e566003b975807c61.zip git-33f2790ecafd29b8551a290e566003b975807c61.tar.gz git-33f2790ecafd29b8551a290e566003b975807c61.tar.bz2 | |
Merge branch 'vv/merge-squash-with-explicit-commit' into maint
"git merge --squash" is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the "--commit" option; the command now refuses to work
when both options are given.
* vv/merge-squash-with-explicit-commit:
merge: refuse --commit with --squash
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 7f9c68c..4ec5d9e 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -570,6 +570,12 @@ test_expect_success 'combining --squash and --no-ff is refused' ' test_must_fail git merge --no-ff --squash c1 ' +test_expect_success 'combining --squash and --commit is refused' ' + git reset --hard c0 && + test_must_fail git merge --squash --commit c1 && + test_must_fail git merge --commit --squash c1 +' + test_expect_success 'option --ff-only overwrites --no-ff' ' git merge --no-ff --ff-only c1 && test_must_fail git merge --no-ff --ff-only c2 |