summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
diff options
context:
space:
mode:
authorH.Merijn Brand <h.m.brand@xs4all.nl>2007-12-17 22:28:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-18 04:49:18 (GMT)
commit3175b0cfc1392de1ff00c01796f85b92df317cc8 (patch)
tree35249d47fa8f8864d3bc1a96eb4b1aa82dac95c6 /t/t4200-rerere.sh
parent68e6a4f80d4bea2d281c30fa2bbcd4968b0ccc4e (diff)
downloadgit-3175b0cfc1392de1ff00c01796f85b92df317cc8.zip
git-3175b0cfc1392de1ff00c01796f85b92df317cc8.tar.gz
git-3175b0cfc1392de1ff00c01796f85b92df317cc8.tar.bz2
the use of 'tr' in the test suite isn't really portable
Some versions of 'tr' only accept octal codes if entered with three digits, and therefor misinterpret the '\0' in the test suite. Some versions of 'tr' reject the (needless) use of character classes. Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
-rwxr-xr-xt/t4200-rerere.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index cfcdb69..eeff3c9 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' '\0' > .git/rr-cache/MERGE_RR
+echo "$sha1 a1" | tr '\012' '\000' > .git/rr-cache/MERGE_RR
test_expect_success 'rerere clear' 'git rerere clear'