summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Đoàn Trần Công Danh <congdanhqx@gmail.com>2021-07-04 12:46:11 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-06 12:24:11 -0700
commit66c9562013de1d8fc04fb46a75fb88122df303c4 (patch)
treeadde48086505266ae6e4b552cdb2415a51fea7c3 /t
parenttest-lib-functions: introduce test_stdout_line_count (diff)
downloadtgif-66c9562013de1d8fc04fb46a75fb88122df303c4.tar.xz
t6400: preserve git ls-files exit status code
In t6400, we're checking number of files in the index and the working tree by piping the output of "git ls-files" to "wc -l", thus losing the exit status code of git. Let's use the newly introduced test_stdout_line_count in order to check the exit status code of Git's command. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t6400-merge-df.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh
index 38700d29b5..57a67cf362 100755
--- a/t/t6400-merge-df.sh
+++ b/t/t6400-merge-df.sh
@@ -82,13 +82,13 @@ test_expect_success 'modify/delete + directory/file conflict' '
git checkout delete^0 &&
test_must_fail git merge modify &&
- test 5 -eq $(git ls-files -s | wc -l) &&
- test 4 -eq $(git ls-files -u | wc -l) &&
+ test_stdout_line_count = 5 git ls-files -s &&
+ test_stdout_line_count = 4 git ls-files -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 0 -eq $(git ls-files -o | wc -l)
+ test_stdout_line_count = 0 git ls-files -o
else
- test 1 -eq $(git ls-files -o | wc -l)
+ test_stdout_line_count = 1 git ls-files -o
fi &&
test_path_is_file letters/file &&
@@ -103,13 +103,13 @@ test_expect_success 'modify/delete + directory/file conflict; other way' '
test_must_fail git merge delete &&
- test 5 -eq $(git ls-files -s | wc -l) &&
- test 4 -eq $(git ls-files -u | wc -l) &&
+ test_stdout_line_count = 5 git ls-files -s &&
+ test_stdout_line_count = 4 git ls-files -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 0 -eq $(git ls-files -o | wc -l)
+ test_stdout_line_count = 0 git ls-files -o
else
- test 1 -eq $(git ls-files -o | wc -l)
+ test_stdout_line_count = 1 git ls-files -o
fi &&
test_path_is_file letters/file &&