Skip to content

Commit c559677

Browse files
pks-tgitster
authored andcommitted
t7800: use single quotes for test bodies
In eb84c8b (git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`, 2024-02-20) we have started to loop around some of the tests in t7800 so that they are reexecuted with slightly different arguments. As part of that refactoring the quoting of test bodies was changed from single quotes (') to double quotes (") so that the value of the loop variable is accessible to the body. As the test body is later on passed to eval this change was not required though. Let's revert it back to use single quotes as usual in our tests. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ac45f68 commit c559677

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

t/t7800-difftool.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,42 +93,42 @@ test_expect_success 'difftool forwards arguments to diff' '
9393

9494
for opt in '' '--dir-diff'
9595
do
96-
test_expect_success "difftool ${opt:-without options} ignores exit code" "
96+
test_expect_success "difftool ${opt:-without options} ignores exit code" '
9797
test_config difftool.error.cmd false &&
9898
git difftool ${opt} -y -t error branch
99-
"
99+
'
100100

101-
test_expect_success "difftool ${opt:-without options} forwards exit code with --trust-exit-code" "
101+
test_expect_success "difftool ${opt:-without options} forwards exit code with --trust-exit-code" '
102102
test_config difftool.error.cmd false &&
103103
test_must_fail git difftool ${opt} -y --trust-exit-code -t error branch
104-
"
104+
'
105105

106-
test_expect_success "difftool ${opt:-without options} forwards exit code with --trust-exit-code for built-ins" "
106+
test_expect_success "difftool ${opt:-without options} forwards exit code with --trust-exit-code for built-ins" '
107107
test_config difftool.vimdiff.path false &&
108108
test_must_fail git difftool ${opt} -y --trust-exit-code -t vimdiff branch
109-
"
109+
'
110110

111-
test_expect_success "difftool ${opt:-without options} honors difftool.trustExitCode = true" "
111+
test_expect_success "difftool ${opt:-without options} honors difftool.trustExitCode = true" '
112112
test_config difftool.error.cmd false &&
113113
test_config difftool.trustExitCode true &&
114114
test_must_fail git difftool ${opt} -y -t error branch
115-
"
115+
'
116116

117-
test_expect_success "difftool ${opt:-without options} honors difftool.trustExitCode = false" "
117+
test_expect_success "difftool ${opt:-without options} honors difftool.trustExitCode = false" '
118118
test_config difftool.error.cmd false &&
119119
test_config difftool.trustExitCode false &&
120120
git difftool ${opt} -y -t error branch
121-
"
121+
'
122122

123-
test_expect_success "difftool ${opt:-without options} ignores exit code with --no-trust-exit-code" "
123+
test_expect_success "difftool ${opt:-without options} ignores exit code with --no-trust-exit-code" '
124124
test_config difftool.error.cmd false &&
125125
test_config difftool.trustExitCode true &&
126126
git difftool ${opt} -y --no-trust-exit-code -t error branch
127-
"
127+
'
128128

129-
test_expect_success "difftool ${opt:-without options} stops on error with --trust-exit-code" "
130-
test_when_finished 'rm -f for-diff .git/fail-right-file' &&
131-
test_when_finished 'git reset -- for-diff' &&
129+
test_expect_success "difftool ${opt:-without options} stops on error with --trust-exit-code" '
130+
test_when_finished "rm -f for-diff .git/fail-right-file" &&
131+
test_when_finished "git reset -- for-diff" &&
132132
write_script .git/fail-right-file <<-\EOF &&
133133
echo failed
134134
exit 1
@@ -138,19 +138,19 @@ do
138138
test_must_fail git difftool ${opt} -y --trust-exit-code \
139139
--extcmd .git/fail-right-file branch >actual &&
140140
test_line_count = 1 actual
141-
"
141+
'
142142

143-
test_expect_success "difftool ${opt:-without options} honors exit status if command not found" "
143+
test_expect_success "difftool ${opt:-without options} honors exit status if command not found" '
144144
test_config difftool.nonexistent.cmd i-dont-exist &&
145145
test_config difftool.trustExitCode false &&
146-
if test "${opt}" = '--dir-diff'
146+
if test "${opt}" = --dir-diff
147147
then
148148
expected_code=127
149149
else
150150
expected_code=128
151151
fi &&
152-
test_expect_code \${expected_code} git difftool ${opt} -y -t nonexistent branch
153-
"
152+
test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
153+
'
154154
done
155155

156156
test_expect_success 'difftool honors --gui' '

0 commit comments

Comments
 (0)