rebase -i: comment out squash!/fixup! subjects from squash message
commit7cdb9682545d7865e832d092f900a8037898e907
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Fri, 29 Jan 2021 18:20:44 +0000 (29 23:50 +0530)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2021 23:21:56 +0000 (29 15:21 -0800)
treeb4436608496d09da66d370606d212563659362f2
parent498bb5b82e78ddf880ab8516d4e6ac4fc5f9b215
rebase -i: comment out squash!/fixup! subjects from squash message

When squashing commit messages the squash!/fixup! subjects are not of
interest so comment them out to stop them becoming part of the final
message.

This change breaks a bunch of --autosquash tests which rely on the
"squash! <subject>" line appearing in the final commit message. This is
addressed by adding a second line to the commit message of the "squash!
..." commits and testing for that.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
t/t3415-rebase-autosquash.sh
t/t3900-i18n-commit.sh