summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd8fc4a)
raw | patch | inline | side by side (parent: fd8fc4a)
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Thu, 2 Mar 2006 11:43:51 +0000 (12:43 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 3 Mar 2006 07:06:47 +0000 (23:06 -0800) |
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>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t8001-annotate.sh | patch | blob | history |
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index cae179436c16f90582baba673373c502b7a0bf52..172908a5b082805f62d8c570a1f2ee77064a3697 100755 (executable)
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
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 \