It is true that we do not make a commit when we are asked to do
"merge --squash", and the code does so by setting option_commit
variable to zero when seeing the squash option. But this made it
impossible to see from the value of option_commit if --no-commit was
given from the command line, or --squash turned it off.
We check for the value of option_commit at only two places. Check
for the value of squash at them, too.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* Just a preliminary clean-up for the next one which is on topic.
builtin/merge.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index bf2f261..de9d1b6 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1237,11 +1237,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (verbosity < 0)
show_diffstat = 0;
- if (squash) {
- if (fast_forward == FF_NO)
- die(_("You cannot combine --squash with --no-ff."));
- option_commit = 0;
- }
+ if (squash && fast_forward == FF_NO)
+ die(_("You cannot combine --squash with --no-ff."));
if (!argc) {
if (default_to_upstream)
@@ -1449,10 +1446,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* We are not doing octopus and not fast-forward. Need
* a real merge.
*/
- else if (!remoteheads->next && !common->next && option_commit) {
+ else if (!remoteheads->next && !common->next && option_commit && !squash)
/*
* We are not doing octopus, not fast-forward, and have
- * only one common.
+ * only one common. And we do want to create a new commit.
*/
refresh_cache(REFRESH_QUIET);
if (allow_trivial && fast_forward != FF_ONLY) {
@@ -1535,7 +1532,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
ret = try_merge_strategy(use_strategies[i]->name,
common, remoteheads,
head_commit, head_arg);
- if (!option_commit && !ret) {
+ if ((!option_commit || squash) && !ret) {
merge_was_ok = 1;
/*
* This is necessary here just to avoid writing
--
2.8.1-491-g88b9e4a
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html