X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1400-update-ref.sh;h=ce045b2a57c13de3ef8a01f806e3472d18bdef37;hb=7e2e69b7f67ba8b336be56508d0208117d9e22e3;hp=c4c0dfaab1adf7866ca82d998b6d7a040a011935;hpb=c576304d512df18fa30b91bb3ac15478d5d4dfb1;p=git.git diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index c4c0dfaab..ce045b2a5 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -198,11 +198,9 @@ 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" \