Web lists-archives.com

[PATCH 2/2] t3430: update to test with custom commentChar




Signed-off-by: Daniel Harding <dharding@xxxxxxxxxxxxx>
---
 t/t3430-rebase-merges.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 78f7c9958..ff474d033 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -56,12 +56,12 @@ test_expect_success 'create completely different structure' '
 	cat >script-from-scratch <<-\EOF &&
 	label onto
 
-	# onebranch
+	> onebranch
 	pick G
 	pick D
 	label onebranch
 
-	# second
+	> second
 	reset onto
 	pick B
 	label second
@@ -70,6 +70,7 @@ test_expect_success 'create completely different structure' '
 	merge -C H second
 	merge onebranch # Merge the topic branch '\''onebranch'\''
 	EOF
+	test_config core.commentChar ">" &&
 	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
 	test_tick &&
 	git rebase -i -r A &&
@@ -107,10 +108,10 @@ test_expect_success 'generate correct todo list' '
 	pick 12bd07b D
 	merge -C 2051b56 E # E
 	merge -C 233d48a H # H
-
 	EOF
 
-	grep -v "^#" <.git/ORIGINAL-TODO >output &&
+	test_config core.commentChar ">" &&
+	git stripspace -s <.git/ORIGINAL-TODO >output &&
 	test_cmp expect output
 '
 
-- 
2.18.0