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/t3406-rebase-message.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/t3406-rebase-message.sh')
-rwxr-xr-x | t/t3406-rebase-message.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 332b2b2feb..5391080943 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -37,7 +37,7 @@ test_expect_success 'rebase -m' ' git rebase -m master >report && sed -n -e "/^Already applied: /p" \ -e "/^Committed: /p" report >actual && - diff -u expect actual + test_cmp expect actual ' |