summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-03-02 11:43:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-03 07:06:47 (GMT)
commitd5dddccaa0c61c67340efca36237dfa06eccef1c (patch)
tree1eb9de139f90248ef6584b55a9d9a56031b1acfc
parentfd8fc4ade5c8973b3dca264cc0c26b091982870b (diff)
downloadgit-d5dddccaa0c61c67340efca36237dfa06eccef1c.zip
git-d5dddccaa0c61c67340efca36237dfa06eccef1c.tar.gz
git-d5dddccaa0c61c67340efca36237dfa06eccef1c.tar.bz2
Fix test case for some sed
Some versions of sed lack the "-i" option. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t8001-annotate.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index cae1794..172908a 100755
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -50,7 +50,8 @@ test_expect_success \
test_expect_success \
'merge-setup part 2' \
'git checkout -b branch2 master &&
- sed -i -e "s/2A quick brown/4A quick brown lazy dog/" file &&
+ sed -e "s/2A quick brown/4A quick brown lazy dog/" < file > file.new &&
+ mv file.new file &&
GIT_AUTHOR_NAME="B2" git commit -a -m "Branch2-1"'
test_expect_success \