summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-07 22:22:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-09 20:29:07 (GMT)
commit8cf8f9b4aa798c93b33a1838eba17ccd3fb31f43 (patch)
tree715f3aa17cc98058392883560bfaa0836726db46
parent559c6fc317f92a0a3994f816d3513cd322745852 (diff)
downloadgit-8cf8f9b4aa798c93b33a1838eba17ccd3fb31f43.zip
git-8cf8f9b4aa798c93b33a1838eba17ccd3fb31f43.tar.gz
git-8cf8f9b4aa798c93b33a1838eba17ccd3fb31f43.tar.bz2
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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3404-rebase-interactive.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index bf0dc75..ae6e55c 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
)
'