summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3e4339e)
raw | patch | inline | side by side (parent: 3e4339e)
author | Dennis Stosberg <dennis@stosberg.net> | |
Sun, 18 Jun 2006 20:33:21 +0000 (22:33 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 18 Jun 2006 20:58:20 +0000 (13:58 -0700) |
These two tests assume that "sed" will not modify the final line of a
stream if it does not end with a newline character. The assumption is
not true at least for FreeBSD and Solaris 9. FreeBSD's "sed" appends
a newline character; "sed" in Solaris 9 even removes the incomplete
final line. This patch makes the test use perl instead.
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
stream if it does not end with a newline character. The assumption is
not true at least for FreeBSD and Solaris 9. FreeBSD's "sed" appends
a newline character; "sed" in Solaris 9 even removes the incomplete
final line. This patch makes the test use perl instead.
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/annotate-tests.sh | patch | blob | history |
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 114938c3ff18fadb130e6809fc14e89cfe3f36f2..c04f0e1540794c3d4d950c158beee249ba98b726 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
test_expect_success \
'some edit' \
- 'mv file file1 &&
- sed -e 1d -e "5s/3A/99/" file1 >file &&
- rm -f file1 &&
+ 'perl -pi -e "s/^1A.*\n$//; s/^3A/99/" file &&
GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
test_expect_success \