diff options
| author | Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-10 15:59:00 -0700 |
| commit | 3df4e3bb092ec007d1967038baaf9fc39acaff8d (patch) | |
| tree | 3327b2d752eaf60f8077bfa7f829299da62cbd2f /t/t6422-merge-rename-corner-cases.sh | |
| parent | 3b6eb15d2b419c26bf1490b932c45913a1acb601 (diff) | |
| download | git-3df4e3bb092ec007d1967038baaf9fc39acaff8d.tar.gz | |
t6416, t6422: fix incorrect untracked file count
Apparently I don't know how to count untracked files, and since the
tests in question were marked as test_expect_failure, no one ever
noticed it until now. Correct the count, as these tests clearly create
three untracked files ('out', 'err', and 'file_count').
(I believe this problem arose because earlier incarnations counted lines
via a pipe to 'wc -l'. Reviewers asked that it be replaced by writing
the output to a file and using test_line_count, but when the temporary
output was added to a separate file, the count of untracked files should
have increased.)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6422-merge-rename-corner-cases.sh')
| -rwxr-xr-x | t/t6422-merge-rename-corner-cases.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh index 7da75c1736..c8ee033ad9 100755 --- a/t/t6422-merge-rename-corner-cases.sh +++ b/t/t6422-merge-rename-corner-cases.sh @@ -899,7 +899,7 @@ test_expect_failure 'rad-check: rename/add/delete conflict' ' git ls-files -u >file_count && test_line_count = 2 file_count && git ls-files -o >file_count && - test_line_count = 2 file_count && + test_line_count = 3 file_count && git rev-parse >actual \ :2:bar :3:bar && @@ -967,7 +967,7 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' ' git ls-files -u >file_count && test_line_count = 2 file_count && git ls-files -o >file_count && - test_line_count = 2 file_count && + test_line_count = 3 file_count && git rev-parse >actual \ :2:baz :3:baz && |