Merge branch 'jc/test-cleanup'

gitster · gitster · commit f06fb376edd8 · 2019-09-30T13:19:23.000+09:00
Code cleanup.

* jc/test-cleanup:
  t3005: remove unused variable
  t: use LF variable defined in the test harness
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
@@ -7,8 +7,6 @@ This test runs git ls-files with various relative path arguments.
 
 . ./test-lib.sh
 
-new_line='
-'
 sq=\'
 
 test_expect_success 'prepare' '
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
@@ -155,8 +155,6 @@ test_expect_success 'rebase -x with empty command fails' '
 	test_i18ncmp expected actual
 '
 
-LF='
-'
 test_expect_success 'rebase -x with newline in command fails' '
 	test_when_finished "git rebase --abort ||:" &&
 	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
@@ -7,9 +7,6 @@ test_description='Various diff formatting options'
 
 . ./test-lib.sh
 
-LF='
-'
-
 test_expect_success setup '
 
 	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
@@ -12,9 +12,6 @@ GIT_TEST_PROTOCOL_VERSION=
 
 . ./test-lib.sh
 
-LF='
-'
-
 test_expect_success setup '
 	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
 	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,6 @@ test_expect_success 'rebase -x with empty command fails' '`
`155`	`155`	`test_i18ncmp expected actual`
`156`	`156`	`'`
`157`	`157`
`158`		`-LF='`
`159`		`-'`
`160`	`158`	`test_expect_success 'rebase -x with newline in command fails' '`
`161`	`159`	`test_when_finished "git rebase --abort \|\|:" &&`
`162`	`160`	`test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&`