File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -670,7 +670,7 @@ test_expect_success 'rev-list W/ --missing=print' '
670
670
awk -f print_2.awk ls_files_result |
671
671
sort >expected &&
672
672
673
- for id in `cat expected | sed "s|..|&/|"`
673
+ for id in `sed "s|..|&/|" expected `
674
674
do
675
675
rm r1/.git/objects/$id || return 1
676
676
done &&
Original file line number Diff line number Diff line change @@ -34,14 +34,14 @@ test_expect_success setup '
34
34
test_expect_success ' Check "ours" is CRLF' '
35
35
git reset --hard initial &&
36
36
git merge side -s ours &&
37
- cat file | remove_cr | append_cr >file.temp &&
37
+ remove_cr < file | append_cr >file.temp &&
38
38
test_cmp file file.temp
39
39
'
40
40
41
41
test_expect_success ' Check that conflict file is CRLF' '
42
42
git reset --hard a &&
43
43
test_must_fail git merge side &&
44
- cat file | remove_cr | append_cr >file.temp &&
44
+ remove_cr < file | append_cr >file.temp &&
45
45
test_cmp file file.temp
46
46
'
47
47
You can’t perform that action at this time.
0 commit comments