path: root/t/
diff options
authorPhillip Wood <>2021-01-29 18:20:44 (GMT)
committerJunio C Hamano <>2021-01-29 23:21:56 (GMT)
commit7cdb9682545d7865e832d092f900a8037898e907 (patch)
treeb4436608496d09da66d370606d212563659362f2 /t/
parent498bb5b82e78ddf880ab8516d4e6ac4fc5f9b215 (diff)
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 <> Reviewed-by: Taylor Blau <> Signed-off-by: Charvi Mendiratta <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 0 insertions, 4 deletions
diff --git a/t/ b/t/
index d277a9f..bfab245 100755
--- a/t/
+++ b/t/
@@ -226,10 +226,6 @@ test_commit_autosquash_multi_encoding () {
git rev-list HEAD >actual &&
test_line_count = 3 actual &&
iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
- if test $flag = squash; then
- subject="$(head -1 expect)" &&
- printf "\nsquash! %s\n" "$subject" >>expect
- fi &&
git cat-file commit HEAD^ >raw &&
(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
test_cmp expect actual