diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-25 16:16:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-25 16:16:34 -0700 |
| commit | a7f0fcb335cdd01a01e22fe80bc66c3eee2d9f38 (patch) | |
| tree | 83a700dcda66f4985ef7603ff2448f2520c0fd0d /t/t4002-diff-basic.sh | |
| parent | 46d8bf30e47c0426e83c9899f55703807eb3129b (diff) | |
| parent | c2a7536354561279eec277021690bf0fe9200b7b (diff) | |
| download | git-a7f0fcb335cdd01a01e22fe80bc66c3eee2d9f38.tar.xz | |
Merge branch 'bb/sh-scripts-cleanup'
Shell scripts clean-up.
* bb/sh-scripts-cleanup: (22 commits)
git-quiltimport: avoid an unnecessary subshell
contrib/coverage-diff: avoid redundant pipelines
t/t9*: merge "grep | sed" pipelines
t/t8*: merge "grep | sed" pipelines
t/t5*: merge a "grep | sed" pipeline
t/t4*: merge a "grep | sed" pipeline
t/t3*: merge a "grep | awk" pipeline
t/t1*: merge a "grep | sed" pipeline
t/t9*: avoid redundant uses of cat
t/t8*: avoid redundant use of cat
t/t7*: avoid redundant use of cat
t/t6*: avoid redundant uses of cat
t/t5*: avoid redundant uses of cat
t/t4*: avoid redundant uses of cat
t/t3*: avoid redundant uses of cat
t/t1*: avoid redundant uses of cat
t/t0*: avoid redundant uses of cat
t/perf: avoid redundant use of cat
t/annotate-tests.sh: avoid redundant use of cat
t/lib-cvs.sh: avoid redundant use of cat
...
Diffstat (limited to 't/t4002-diff-basic.sh')
| -rwxr-xr-x | t/t4002-diff-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh index 7afc883ec3..cb3307010c 100755 --- a/t/t4002-diff-basic.sh +++ b/t/t4002-diff-basic.sh @@ -405,7 +405,7 @@ test_expect_success 'diff-tree -r B A == diff-tree -r -R A B' ' test_expect_success 'diff can read from stdin' ' test_must_fail git diff --no-index -- MN - < NN | - grep -v "^index" | sed "s#/-#/NN#" >.test-a && + sed "/^index/d; s#/-#/NN#" >.test-a && test_must_fail git diff --no-index -- MN NN | grep -v "^index" >.test-b && test_cmp .test-a .test-b |