git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-12 15:59:24 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

t/t6*: avoid redundant uses of cat

Browse Source 
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>
This commit is contained in:
Beat Bolli 2024-03-15 20:46:08 +01:00 committed by Junio C Hamano
parent f636d25dc4
commit edfa63e7f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6112-rev-list-filters-objects.sh
View File

@ -670,7 +670,7 @@ test_expect_success 'rev-list W/ --missing=print' '
awk -f print_2.awk ls_files_result | awk -f print_2.awk ls_files_result |
sort >expected && sort >expected &&
for id in `cat expected | sed "s|..|&/|"` for id in `sed "s|..|&/|" expected`
do do
rm r1/.git/objects/$id || return 1 rm r1/.git/objects/$id || return 1
done && done &&

4
t/t6413-merge-crlf.sh
View File

@ -34,14 +34,14 @@ test_expect_success setup '
test_expect_success 'Check "ours" is CRLF' ' test_expect_success 'Check "ours" is CRLF' '
git reset --hard initial && git reset --hard initial &&
git merge side -s ours && 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_cmp file file.temp
' '
test_expect_success 'Check that conflict file is CRLF' ' test_expect_success 'Check that conflict file is CRLF' '
git reset --hard a && git reset --hard a &&
test_must_fail git merge side && 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 test_cmp file file.temp
' '