From: Johannes Schindelin Date: Fri, 14 Jul 2017 14:44:38 GMT Subject: [PATCH v6 01/10] t3415: verify that an empty instructionFormat is handled as before Message-ID: <52e711346eba2fca30225da1d4f42cb17f7ee08b.1500043437.git.johannes.schindelin@gmx.de> In-Reply-To: An upcoming patch will move the todo list generation into the rebase--helper. An early version of that patch regressed on an empty rebase.instructionFormat value (the shell version could not discern between an empty one and a non-existing one, but the C version used the empty one as if that was intended to skip the oneline from the `pick ` lines). Let's verify that this still works as before. Signed-off-by: Johannes Schindelin --- t/t3415-rebase-autosquash.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 5848949ec37..6d99f624b62 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -271,6 +271,18 @@ test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' ' test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l) ' +test_expect_success 'autosquash with empty custom instructionFormat' ' + git reset --hard base && + test_commit empty-instructionFormat-test && + ( + set_cat_todo_editor && + test_must_fail git -c rebase.instructionFormat= \ + rebase --autosquash --force -i HEAD^ >actual && + git log -1 --format="pick %h %s" >expect && + test_cmp expect actual + ) +' + set_backup_editor () { write_script backup-editor.sh <<-\EOF cp "$1" .git/backup-"$(basename "$1")" -- 2.13.3.windows.1.13.gaf0c2223da0