diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-12 10:08:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-12 10:08:52 -0800 |
| commit | 9865ef24578c750625054e2f382b9c764befe870 (patch) | |
| tree | 5d59dabc11b7c2b1a6b188aca5b235b734f52428 | |
| parent | Merge branch 'ps/repack-keep-unreachable-in-unpacked-repo' (diff) | |
| parent | t6423: fix suppression of Git’s exit code in tests (diff) | |
| download | git-9865ef24578c750625054e2f382b9c764befe870.tar.gz git-9865ef24578c750625054e2f382b9c764befe870.zip | |
Merge branch 'ac/t6423-unhide-git-exit-status'
Test clean-up.
* ac/t6423-unhide-git-exit-status:
t6423: fix suppression of Git’s exit code in tests
| -rwxr-xr-x | t/t6423-merge-rename-directories.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh index 88d1cf2cde..94080c65d1 100755 --- a/t/t6423-merge-rename-directories.sh +++ b/t/t6423-merge-rename-directories.sh @@ -5071,7 +5071,8 @@ test_expect_success '12i: Directory rename causes rename-to-self' ' test_path_is_file source/bar && test_path_is_file source/baz && - git ls-files | uniq >tracked && + git ls-files >actual && + uniq <actual >tracked && test_line_count = 3 tracked && git status --porcelain -uno >actual && @@ -5129,7 +5130,8 @@ test_expect_success '12j: Directory rename to root causes rename-to-self' ' test_path_is_file bar && test_path_is_file baz && - git ls-files | uniq >tracked && + git ls-files >actual && + uniq <actual >tracked && test_line_count = 3 tracked && git status --porcelain -uno >actual && @@ -5187,7 +5189,8 @@ test_expect_success '12k: Directory rename with sibling causes rename-to-self' ' test_path_is_file dirA/bar && test_path_is_file dirA/baz && - git ls-files | uniq >tracked && + git ls-files >actual && + uniq <actual >tracked && test_line_count = 3 tracked && git status --porcelain -uno >actual && |