pr-818/dscho/autosquash-without-scissors-v2
tagged this
08 Jan 16:28
From: Johannes Schindelin <johannes.schindelin@gmx.de> In 6e98de72c03 (sequencer (rebase -i): add support for the 'fixup' and 'squash' commands, 2017-01-02), this developer introduced a change of behavior by mistake: when encountering a `fixup!` commit (or multiple `fixup!` commits) without any `squash!` commit thrown in, the final `git commit` was invoked with `--cleanup=strip`. Prior to that commit, the commit command had been called without that `--cleanup` option. Since we explicitly read the original commit message from a file in that case, there is really no sense in forcing that clean-up. We actually need to actively suppress that clean-up lest a configured `commit.cleanup` may interfere with what we want to do: leave the commit message unchanged. Reported-by: Vojtěch Knyttl <vojtech@knyt.tl> Helped-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Submitted-As: https://lore.kernel.org/git/pull.818.v2.git.1610123298764.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.818.git.1608337339246.gitgitgadget@gmail.com
Assets 2
-
2021-01-08T16:28:18Z -
2021-01-08T16:28:18Z -