git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 05/11] t/t3437: fix indentation of the here-doc

From
Charvi Mendiratta <charvi077@gmail.com>
Date
Feb 8, 2021, 19:25 UTC
Message-ID
<20210208192528.21399-6-charvi077@gmail.com>
In-Reply-To
<20210207181439.1178-1-charvi077@gmail.com>

The most common way to format here-docs in Git test scripts is for the body and EOF to be indented the same amount as the command which opened the here-doc. Fix a few here-docs in this script to conform to that standard.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
---
 t/t3437-rebase-fixup-options.sh | 62 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t3437-rebase-fixup-options.sh b/t/t3437-rebase-fixup-options.sh
index 36dee15c4b..3de899f68a 100755
--- a/t/t3437-rebase-fixup-options.sh
+++ b/t/t3437-rebase-fixup-options.sh
@@ -38,13 +38,13 @@ get_author () {
 
 test_expect_success 'setup' '
 	cat >message <<-EOF &&
-		amend! B
-		${EMPTY}
-		new subject
-		${EMPTY}
-		new
-		body
-		EOF
+	amend! B
+	${EMPTY}
+	new subject
+	${EMPTY}
+	new
+	body
+	EOF
 
 	sed "1,2d" message >expected-message &&
 
@@ -70,38 +70,38 @@ test_expect_success 'setup' '
 	git commit --fixup=HEAD -a &&
 	test_tick &&
 	git commit --allow-empty -F - <<-EOF &&
-		amend! B
-		${EMPTY}
-		B
-		${EMPTY}
-		edited 1
-		EOF
+	amend! B
+	${EMPTY}
+	B
+	${EMPTY}
+	edited 1
+	EOF
 	test_tick &&
 	git commit --allow-empty -F - <<-EOF &&
-		amend! amend! B
-		${EMPTY}
-		B
-		${EMPTY}
-		edited 1
-		${EMPTY}
-		edited 2
-		EOF
+	amend! amend! B
+	${EMPTY}
+	B
+	${EMPTY}
+	edited 1
+	${EMPTY}
+	edited 2
+	EOF
 	echo B2 >B &&
 	test_tick &&
 	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
 	echo B3 >B &&
 	test_tick &&
 	git commit -a -F - <<-EOF &&
-		amend! amend! amend! B
-		${EMPTY}
-		B
-		${EMPTY}
-		edited 1
-		${EMPTY}
-		edited 2
-		${EMPTY}
-		edited 3
-		EOF
+	amend! amend! amend! B
+	${EMPTY}
+	B
+	${EMPTY}
+	edited 1
+	${EMPTY}
+	edited 2
+	${EMPTY}
+	edited 3
+	EOF
 
 	GIT_AUTHOR_NAME="Rebase Author" &&
 	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
-- 
2.29.0.rc1
Previous: Charvi MendirattaNext: Charvi Mendiratta
Message 34 of 58 in “[Outreachy] Improve the 'fixup [-C | -c]' in interactive rebase”
  1. 0/7 [Outreachy] Improve the 'fixup [-C | -c]' in interactive rebaseCharvi Mendiratta, Feb 7, 2021
  2. 1/7 sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta, Feb 7, 2021
  3. 2/7 sequencer: rename a few functionsCharvi Mendiratta, Feb 7, 2021
  4. 3/7 rebase -i: clarify and fix 'fixup -c' rebase-todo helpCharvi Mendiratta, Feb 7, 2021
  5. Eric SunshineFeb 7, 2021
  6. Charvi MendirattaFeb 8, 2021
  7. 7/7 doc/rebase -i: fix typo in the documentation of 'fixup' commandCharvi Mendiratta, Feb 7, 2021
  8. 5/7 t3437: fix indendation of the here-docCharvi Mendiratta, Feb 7, 2021
  9. Eric SunshineFeb 7, 2021
  10. Charvi MendirattaFeb 8, 2021
  11. Phillip WoodFeb 8, 2021
  12. 4/7 t/lib-rebase: change the implementation of commands with optionsCharvi Mendiratta, Feb 7, 2021
  13. 6/7 t/t3437: update the testsCharvi Mendiratta, Feb 7, 2021
  14. Eric SunshineFeb 7, 2021
  15. Charvi MendirattaFeb 8, 2021
  16. Eric SunshineFeb 7, 2021
  17. Charvi MendirattaFeb 8, 2021
  18. 00/11 [Outreachy] Improve the 'fixup [-C | -c]' in interactive rebaseCharvi Mendiratta, Feb 8, 2021
  19. Junio C HamanoFeb 8, 2021
  20. Charvi MendirattaFeb 9, 2021
  21. 01/11 sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta, Feb 8, 2021
  22. 02/11 sequencer: rename a few functionsCharvi Mendiratta, Feb 8, 2021
  23. 03/11 rebase -i: clarify and fix 'fixup -c' rebase-todo helpCharvi Mendiratta, Feb 8, 2021
  24. Junio C HamanoFeb 8, 2021
  25. Charvi MendirattaFeb 9, 2021
  26. Eric SunshineFeb 9, 2021
  27. Junio C HamanoFeb 9, 2021
  28. Eric SunshineFeb 9, 2021
  29. Charvi MendirattaFeb 10, 2021
  30. 04/11 t/lib-rebase: change the implementation of commands with optionsCharvi Mendiratta, Feb 8, 2021
  31. Junio C HamanoFeb 8, 2021
  32. Christian CouderFeb 8, 2021
  33. Charvi MendirattaFeb 9, 2021
  34. 05/11 t/t3437: fix indentation of the here-docCharvi Mendiratta, Feb 8, 2021
  35. 06/11 t/t3437: remove the dependency of 'expected-message' file from testsCharvi Mendiratta, Feb 8, 2021
  36. 07/11 t/t3437: check author date of the fixed up commitCharvi Mendiratta, Feb 8, 2021
  37. 10/11 t/t3437: fixup the test 'multiple fixup -c opens editor once'Charvi Mendiratta, Feb 8, 2021
  38. 08/11 t/t3437: simplify and document the test helpersCharvi Mendiratta, Feb 8, 2021
  39. 09/11 t/t3437: cleanup the 'setup' test and use named commits in the testsCharvi Mendiratta, Feb 8, 2021
  40. Junio C HamanoFeb 8, 2021
  41. Charvi MendirattaFeb 9, 2021
  42. 11/11 doc/rebase -i: fix typo in the documentation of 'fixup' commandCharvi Mendiratta, Feb 8, 2021
  43. 00/11 [Outreachy] Improve the 'fixup [-C | -c]' in interactive rebaseCharvi Mendiratta, Feb 10, 2021
  44. Junio C HamanoFeb 11, 2021
  45. Charvi MendirattaFeb 11, 2021
  46. Junio C HamanoFeb 11, 2021
  47. Charvi MendirattaFeb 12, 2021
  48. 01/11 sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta, Feb 10, 2021
  49. 03/11 rebase -i: clarify and fix 'fixup -c' rebase-todo helpCharvi Mendiratta, Feb 10, 2021
  50. 05/11 t/t3437: fixup here-docs in the 'setup' testCharvi Mendiratta, Feb 10, 2021
  51. 04/11 t/lib-rebase: update the documentation of FAKE_LINESCharvi Mendiratta, Feb 10, 2021
  52. 02/11 sequencer: rename a few functionsCharvi Mendiratta, Feb 10, 2021
  53. 06/11 t/t3437: remove the dependency of 'expected-message' file from testsCharvi Mendiratta, Feb 10, 2021
  54. 07/11 t/t3437: check the author date of fixed up commitCharvi Mendiratta, Feb 10, 2021
  55. 08/11 t/t3437: simplify and document the test helpersCharvi Mendiratta, Feb 10, 2021
  56. 09/11 t/t3437: use named commits in the testsCharvi Mendiratta, Feb 10, 2021
  57. 10/11 t/t3437: fixup the test 'multiple fixup -c opens editor once'Charvi Mendiratta, Feb 10, 2021
  58. 11/11 doc/rebase -i: fix typo in the documentation of 'fixup' commandCharvi Mendiratta, Feb 10, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.