summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-08-31 16:45:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-04 08:59:33 -0700
commit2f3eb68f10be8541b6ffdcbb16d996fd3c7a9e82 (patch)
treeb6f002ca0916a0eac42756a0bebccaf7add3a801 /builtin
parentGit 2.18 (diff)
downloadtgif-2f3eb68f10be8541b6ffdcbb16d996fd3c7a9e82.tar.xz
rebase -i --autosquash: demonstrate a problem skipping the last squash
The `git commit --squash` command can be used not only to amend commit messages and changes, but also to record notes for an upcoming rebase. For example, when the author information of a given commit is incorrect, a user might call `git commit --allow-empty -m "Fix author" --squash <commit>`, to remind them to fix that during the rebase. When the editor would pop up, the user would simply delete the commit message to abort the rebase at this stage, fix the author information, and continue with `git rebase --skip`. (This is a real-world example from the rebase of Git for Windows onto v2.19.0-rc1.) However, there is a bug in `git rebase` that will cause the squash message *not* to be forgotten in this case. It will therefore be reused in the next fixup/squash chain (if any). This patch adds a test case to demonstrate this breakage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions