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/t3201-branch-contains.sh | |
| parent | 37bd6c5a2a1dbefdcbc0120451b95f82055f160f (diff) | |
| parent | aab0abf7ef2c7636e3b37d4a939ae68784b08e06 (diff) | |
| download | git-1f17868b303f762556034db81d02c55de2878e07.tar.gz | |
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/t3201-branch-contains.sh')
| -rwxr-xr-x | t/t3201-branch-contains.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh index 9ef593f0e1..b4cf628d22 100755 --- a/t/t3201-branch-contains.sh +++ b/t/t3201-branch-contains.sh @@ -31,7 +31,7 @@ test_expect_success 'branch --contains=master' ' { echo " master" && echo "* side" } >expect && - diff -u expect actual + test_cmp expect actual ' @@ -41,7 +41,7 @@ test_expect_success 'branch --contains master' ' { echo " master" && echo "* side" } >expect && - diff -u expect actual + test_cmp expect actual ' @@ -51,7 +51,7 @@ test_expect_success 'branch --contains=side' ' { echo "* side" } >expect && - diff -u expect actual + test_cmp expect actual ' |