introduce GIT_WORK_TREE to specify the work tree

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 114938c3ff18fadb130e6809fc14e89cfe3f36f2..cacb273afff1fbddf152bb440451fa141589cf33 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -4,7 +4,9 @@
 check_count () {
        head=
        case "$1" in -h) head="$2"; shift; shift ;; esac
-       $PROG file $head | perl -e '
+       echo "$PROG file $head" >&4
+       $PROG file $head >.result || return 1
+       cat .result | perl -e '
                my %expect = (@ARGV);
                my %count = ();
                while (<STDIN>) {
@@ -94,7 +96,7 @@ test_expect_success \
 test_expect_success \
     'merge-setup part 4' \
     'echo "evil merge." >>file &&
-     EDITOR=: VISUAL=: git commit -a --amend'
+     git commit -a --amend'
 
 test_expect_success \
     'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
@@ -111,9 +113,9 @@ test_expect_success \
 
 test_expect_success \
     'some edit' \
-    'mv file file1 &&
-     sed -e 1d -e "5s/3A/99/" file1 >file &&
-     rm -f file1 &&
+    'mv file file.orig &&
+    sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file &&
+    echo "incomplete" | tr -d "\\012" >>file &&
     GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
 
 test_expect_success \