Merge branch 'gb/maint-doc-svn-log-window-size'

diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index 082032edc36268f1b8e26ca6f409080093ac0f2b..f80bba871cb45a4afb098c96e7925b6361cf7f95 100755 (executable)
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -8,38 +8,38 @@ test_description='Merge base and parent list computation.
 
 . ./test-lib.sh
 
-test_expect_success 'setup' '
-       T=$(git write-tree) &&
+M=1130000000
+Z=+0000
 
-       M=1130000000 &&
-       Z=+0000 &&
+GIT_COMMITTER_EMAIL=git@comm.iter.xz
+GIT_COMMITTER_NAME='C O Mmiter'
+GIT_AUTHOR_NAME='A U Thor'
+GIT_AUTHOR_EMAIL=git@au.thor.xz
+export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
 
-       GIT_COMMITTER_EMAIL=git@comm.iter.xz &&
-       GIT_COMMITTER_NAME="C O Mmiter" &&
-       GIT_AUTHOR_NAME="A U Thor" &&
-       GIT_AUTHOR_EMAIL=git@au.thor.xz &&
-       export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+doit () {
+       OFFSET=$1 &&
+       NAME=$2 &&
+       shift 2 &&
 
-       doit() {
-               OFFSET=$1 &&
-               NAME=$2 &&
-               shift 2 &&
+       PARENTS= &&
+       for P
+       do
+               PARENTS="${PARENTS}-p $P "
+       done &&
 
-               PARENTS= &&
-               for P
-               do
-                       PARENTS="${PARENTS}-p $P "
-               done &&
+       GIT_COMMITTER_DATE="$(($M + $OFFSET)) $Z" &&
+       GIT_AUTHOR_DATE=$GIT_COMMITTER_DATE &&
+       export GIT_COMMITTER_DATE GIT_AUTHOR_DATE &&
 
-               GIT_COMMITTER_DATE="$(($M + $OFFSET)) $Z" &&
-               GIT_AUTHOR_DATE=$GIT_COMMITTER_DATE &&
-               export GIT_COMMITTER_DATE GIT_AUTHOR_DATE &&
+       commit=$(echo $NAME | git commit-tree $T $PARENTS) &&
 
-               commit=$(echo $NAME | git commit-tree $T $PARENTS) &&
+       echo $commit >.git/refs/tags/$NAME &&
+       echo $commit
+}
 
-               echo $commit >.git/refs/tags/$NAME &&
-               echo $commit
-       }
+test_expect_success 'setup' '
+       T=$(git mktree </dev/null)
 '
 
 test_expect_success 'set up G and H' '