From: Johannes Schindelin Date: Sat, 7 Dec 2019 22:22:44 +0000 (+0000) Subject: t3404: fix indentation X-Git-Tag: v2.25.0-rc0~24^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cf8f9b4aa798c93b33a1838eba17ccd3fb31f43;p=thirdparty%2Fgit.git t3404: fix indentation This test case was added in 66ae9a57b88 (t3404: rebase -i: demonstrate short SHA-1 collision, 2013-08-23), and it is not indented in the way we usually indent sub-shell code in our test cases these days. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index bf0dc756d2..ae6e55ce79 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1265,11 +1265,11 @@ test_expect_success SHA1 'short SHA-1 collide' ' test_when_finished "reset_rebase && git checkout master" && git checkout collide && ( - unset test_tick && - test_tick && - set_fake_editor && - FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \ - FAKE_LINES="reword 1 2" git rebase -i HEAD~2 + unset test_tick && + test_tick && + set_fake_editor && + FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \ + FAKE_LINES="reword 1 2" git rebase -i HEAD~2 ) '