diff options
| author | Jeff King <peff@peff.net> | 2008-03-12 17:31:06 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-13 00:57:52 -0700 |
| commit | e85fe4d85bc7654af20ccf8054ab6922665405e5 (patch) | |
| tree | c5094d3bbf30e14de489ec78b00e64fd6ae41a44 /t/t4200-rerere.sh | |
| parent | e8e29c7b5507ed97067391490adbeeca2b1bca34 (diff) | |
| download | git-e85fe4d85bc7654af20ccf8054ab6922665405e5.tar.gz git-e85fe4d85bc7654af20ccf8054ab6922665405e5.tar.xz | |
more tr portability test script fixes
Dealing with NULs is not always safe with tr. On Solaris,
incoming NULs are silently deleted by both the System V and
UCB versions of tr. When converting to NULs, the System V
version works fine, but the UCB version silently ignores the
request to convert the character.
This patch changes all instances of tr using NULs to use
"perl -pe 'y///'" instead.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index eeff3c9c0..3cbfee704 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -129,7 +129,7 @@ test_expect_success 'rerere kicked in' "! grep ======= a1" test_expect_success 'rerere prefers first change' 'git diff a1 expect' rm $rr/postimage -echo "$sha1 a1" | tr '\012' '\000' > .git/rr-cache/MERGE_RR +echo "$sha1 a1" | perl -pe 'y/\012/\000/' > .git/rr-cache/MERGE_RR test_expect_success 'rerere clear' 'git rerere clear' |