Merge branch 'jc/test-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:23 +0000 (13:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:23 +0000 (13:19 +0900)
Code cleanup.

* jc/test-cleanup:
  t3005: remove unused variable
  t: use LF variable defined in the test harness

t/t3005-ls-files-relative.sh
t/t3404-rebase-interactive.sh
t/t4013-diff-various.sh
t/t5515-fetch-merge-logic.sh

index 209b4c7..583e467 100755 (executable)
@@ -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' '
index 461dd53..31114d0 100755 (executable)
@@ -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 &&
index a9054d2..5ac94b3 100755 (executable)
@@ -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" &&
index e55d847..961eb35 100755 (executable)
@@ -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" &&