Add merge-subtree back

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index c4c0dfaab1adf7866ca82d998b6d7a040a011935..71ab2dd0eedd5fa79300fe84fbd168b538dfd36c 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -7,12 +7,19 @@ test_description='Test git update-ref and basic ref logging'
 . ./test-lib.sh
 
 Z=0000000000000000000000000000000000000000
-A=1111111111111111111111111111111111111111
-B=2222222222222222222222222222222222222222
-C=3333333333333333333333333333333333333333
-D=4444444444444444444444444444444444444444
-E=5555555555555555555555555555555555555555
-F=6666666666666666666666666666666666666666
+
+test_expect_success setup '
+
+       for name in A B C D E F
+       do
+               test_tick &&
+               T=$(git write-tree) &&
+               sha1=$(echo $name | git commit-tree $T) &&
+               eval $name=$sha1
+       done
+
+'
+
 m=refs/heads/master
 n_dir=refs/heads/gu
 n=$n_dir/fixes
@@ -198,16 +205,14 @@ test_expect_success \
         GIT_AUTHOR_DATE="2005-05-26 23:41" \
         GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
         h_OTHER=$(git rev-parse --verify HEAD) &&
-        echo FIXED >F &&
         GIT_AUTHOR_DATE="2005-05-26 23:44" \
         GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
         h_FIXED=$(git rev-parse --verify HEAD) &&
-        echo TEST+FIXED >F &&
         echo Merged initial commit and a later commit. >M &&
         echo $h_TEST >.git/MERGE_HEAD &&
         GIT_AUTHOR_DATE="2005-05-26 23:45" \
         GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M &&
-        h_MERGED=$(git rev-parse --verify HEAD)
+        h_MERGED=$(git rev-parse --verify HEAD) &&
         rm -f M'
 
 cat >expect <<EOF