]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t/t6*: avoid redundant uses of cat
authorBeat Bolli <bb@drbeat.li>
Fri, 15 Mar 2024 19:46:08 +0000 (20:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 Mar 2024 18:08:56 +0000 (11:08 -0700)
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6112-rev-list-filters-objects.sh
t/t6413-merge-crlf.sh

index 52822b9461a18c89faa35d7dc0be6a1e4690da18..43e1afd44c9b9f0a00ed34cb4144f8bb1946b602 100755 (executable)
@@ -670,7 +670,7 @@ test_expect_success 'rev-list W/ --missing=print' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       for id in `cat expected | sed "s|..|&/|"`
+       for id in `sed "s|..|&/|" expected`
        do
                rm r1/.git/objects/$id || return 1
        done &&
index b4f4a313f486a583ca62268f2106948cca8d7266..647ea1e8382913887e292977502181b223136b46 100755 (executable)
@@ -34,14 +34,14 @@ test_expect_success setup '
 test_expect_success 'Check "ours" is CRLF' '
        git reset --hard initial &&
        git merge side -s ours &&
-       cat file | remove_cr | append_cr >file.temp &&
+       remove_cr <file | append_cr >file.temp &&
        test_cmp file file.temp
 '
 
 test_expect_success 'Check that conflict file is CRLF' '
        git reset --hard a &&
        test_must_fail git merge side &&
-       cat file | remove_cr | append_cr >file.temp &&
+       remove_cr <file | append_cr >file.temp &&
        test_cmp file file.temp
 '