diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-15 01:10:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-15 01:10:53 -0700 |
| commit | 1f17868b303f762556034db81d02c55de2878e07 (patch) | |
| tree | 60d76ae565c036679570b524d44951b226082384 /t/t6004-rev-list-path-optim.sh | |
| parent | Merge branch 'py/submodule' (diff) | |
| parent | t6000lib: re-fix tr portability (diff) | |
| download | tgif-1f17868b303f762556034db81d02c55de2878e07.tar.xz | |
Merge branch 'jk/portable'
* jk/portable:
t6000lib: re-fix tr portability
t7505: use SHELL_PATH in hook
t9112: add missing #!/bin/sh header
filter-branch: use $SHELL_PATH instead of 'sh'
filter-branch: don't use xargs -0
add NO_EXTERNAL_GREP build option
t6000lib: tr portability fix
t4020: don't use grep -a
add test_cmp function for test scripts
remove use of "tail -n 1" and "tail -1"
grep portability fix: don't use "-e" or "-q"
more tr portability test script fixes
t0050: perl portability fix
tr portability fixes
Diffstat (limited to 't/t6004-rev-list-path-optim.sh')
| -rwxr-xr-x | t/t6004-rev-list-path-optim.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6004-rev-list-path-optim.sh b/t/t6004-rev-list-path-optim.sh index 80d71988b8..5dabf1c5e3 100755 --- a/t/t6004-rev-list-path-optim.sh +++ b/t/t6004-rev-list-path-optim.sh @@ -45,7 +45,7 @@ test_expect_success 'further setup' ' test_expect_success 'path optimization 2' ' ( echo "$side"; echo "$initial" ) >expected && git rev-list HEAD -- a >actual && - diff -u expected actual + test_cmp expected actual ' test_done |