mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'vv/merge-squash-with-explicit-commit'

Browse Source 
"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:
Junio C Hamano
2019-06-17 10:15:17 -07:00
parent 3a54d80ac8 1d14d0c994
commit 6e0b1c60ad
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/merge.c
View File

@ -59,7 +59,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;
@ -1345,9 +1345,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);