Merge branch 'js/symlink'

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 8baf2fef69ba6a67641d2b9ba4dc44468aa31ada..87403da780814787f6c4ea15a790381a5b2395d3 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -4,6 +4,7 @@
 check_count () {
        head=
        case "$1" in -h) head="$2"; shift; shift ;; esac
+       echo "$PROG file $head" >&4
        $PROG file $head >.result || return 1
        cat .result | perl -e '
                my %expect = (@ARGV);
@@ -112,7 +113,8 @@ test_expect_success \
 
 test_expect_success \
     'some edit' \
-    'perl -p -i.orig -e "s/^1A.*\n$//; s/^3A/99/" file &&
+    'mv file file.orig &&
+    sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file &&
     GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
 
 test_expect_success \