development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

t6400: preserve git ls-files exit status code

Browse source 
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>
This commit is contained in:
Đoàn Trần Công Danh 2021-07-04 12:46:11 +07:00 committed by Junio C Hamano
parent cdff1bb5a3
commit 66c9562013
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
t/t6400-merge-df.sh
View file

@ -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 &&