mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
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
This commit is contained in:
commit
33f2790eca
|
@ -102,6 +102,8 @@ merge.
|
|||
+
|
||||
With --no-squash perform the merge and commit the result. This
|
||||
option can be used to override --squash.
|
||||
+
|
||||
With --squash, --commit is not allowed, and will fail.
|
||||
|
||||
-s <strategy>::
|
||||
--strategy=<strategy>::
|
||||
|
|
|
@ -58,7 +58,7 @@ static const char * const builtin_merge_usage[] = {
|
|||
};
|
||||
|
||||
static int show_diffstat = 1, shortlog_len = -1, squash;
|
||||
static int option_commit = 1;
|
||||
static int option_commit = -1;
|
||||
static int option_edit = -1;
|
||||
static int allow_trivial = 1, have_message, verify_signatures;
|
||||
static int overwrite_ignore = 1;
|
||||
|
@ -1339,9 +1339,19 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
|
|||
if (squash) {
|
||||
if (fast_forward == FF_NO)
|
||||
die(_("You cannot combine --squash with --no-ff."));
|
||||
if (option_commit > 0)
|
||||
die(_("You cannot combine --squash with --commit."));
|
||||
/*
|
||||
* squash can now silently disable option_commit - this is not
|
||||
* a problem as it is only overriding the default, not a user
|
||||
* supplied option.
|
||||
*/
|
||||
option_commit = 0;
|
||||
}
|
||||
|
||||
if (option_commit < 0)
|
||||
option_commit = 1;
|
||||
|
||||
if (!argc) {
|
||||
if (default_to_upstream)
|
||||
argc = setup_with_upstream(&argv);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue