git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] t3404: fix indentation
@ 2019-12-07 22:22 Johannes Schindelin via GitGitGadget
  2019-12-07 22:22 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
  0 siblings, 1 reply; 2+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-12-07 22:22 UTC (permalink / raw)
  To: git; +Cc: Johannes Schindelin, Junio C Hamano

Just a little style fix for code that I stumbled on while trying to get the
CI build of pu to pass again.

Johannes Schindelin (1):
  t3404: fix indentation

 t/t3404-rebase-interactive.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


base-commit: 083378cc35c4dbcc607e4cdd24a5fca440163d17
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-487%2Fdscho%2Ft3404-fix-indentation-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-487/dscho/t3404-fix-indentation-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/487
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 1/1] t3404: fix indentation
  2019-12-07 22:22 [PATCH 0/1] t3404: fix indentation Johannes Schindelin via GitGitGadget
@ 2019-12-07 22:22 ` Johannes Schindelin via GitGitGadget
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-12-07 22:22 UTC (permalink / raw)
  To: git; +Cc: Johannes Schindelin, Junio C Hamano, Johannes Schindelin

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 t/t3404-rebase-interactive.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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
 	)
 '
 
-- 
gitgitgadget

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-12-07 22:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-07 22:22 [PATCH 0/1] t3404: fix indentation Johannes Schindelin via GitGitGadget
2019-12-07 22:22 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).