t4103: fix binary patch application test.

[git.git] / t / t1400-update-ref.sh

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 7858d86b93d728712bc6700f575e45c0d9568485..04fab26621af3aee3a44913ab290a4893b4f23ca 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -125,52 +125,101 @@ ed="Thu, 26 May 2005 18:32:00 -0500"
 gd="Thu, 26 May 2005 18:33:00 -0500"
 ld="Thu, 26 May 2005 18:43:00 -0500"
 test_expect_success \
-       'Query "master@May 25 2005" (before history)' \
+       'Query "master@{May 25 2005}" (before history)' \
        'rm -f o e
-        git-rev-parse --verify "master@May 25 2005" >o 2>e &&
+        git-rev-parse --verify "master@{May 25 2005}" >o 2>e &&
         test $C = $(cat o) &&
         test "warning: Log .git/logs/$m only goes back to $ed." = "$(cat e)"'
 test_expect_success \
-       "Query master@2005-05-25 (before history)" \
+       "Query master@{2005-05-25} (before history)" \
        'rm -f o e
-        git-rev-parse --verify master@2005-05-25 >o 2>e &&
+        git-rev-parse --verify master@{2005-05-25} >o 2>e &&
         test $C = $(cat o) &&
         echo test "warning: Log .git/logs/$m only goes back to $ed." = "$(cat e)"'
 test_expect_success \
-       'Query "master@May 26 2005 23:31:59" (1 second before history)' \
+       'Query "master@{May 26 2005 23:31:59}" (1 second before history)' \
        'rm -f o e
-        git-rev-parse --verify "master@May 26 2005 23:31:59" >o 2>e &&
+        git-rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e &&
         test $C = $(cat o) &&
         test "warning: Log .git/logs/$m only goes back to $ed." = "$(cat e)"'
 test_expect_success \
-       'Query "master@May 26 2005 23:32:00" (exactly history start)' \
+       'Query "master@{May 26 2005 23:32:00}" (exactly history start)' \
        'rm -f o e
-        git-rev-parse --verify "master@May 26 2005 23:32:00" >o 2>e &&
+        git-rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
         test $A = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
-       'Query "master@2005-05-26 23:33:01" (middle of history with gap)' \
+       'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' \
        'rm -f o e
-        git-rev-parse --verify "master@2005-05-26 23:33:01" >o 2>e &&
+        git-rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e &&
         test $B = $(cat o) &&
         test "warning: Log .git/logs/$m has gap after $gd." = "$(cat e)"'
 test_expect_success \
-       'Query "master@2005-05-26 23:33:01" (middle of history)' \
+       'Query "master@{2005-05-26 23:38:00}" (middle of history)' \
        'rm -f o e
-        git-rev-parse --verify "master@2005-05-26 23:38:00" >o 2>e &&
+        git-rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
         test $Z = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
-       'Query "master@2005-05-26 23:43:00" (exact end of history)' \
+       'Query "master@{2005-05-26 23:43:00}" (exact end of history)' \
        'rm -f o e
-        git-rev-parse --verify "master@2005-05-26 23:43:00" >o 2>e &&
+        git-rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e &&
         test $E = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
-       'Query "master@2005-05-28" (past end of history)' \
+       'Query "master@{2005-05-28}" (past end of history)' \
        'rm -f o e
-        git-rev-parse --verify "master@2005-05-28" >o 2>e &&
+        git-rev-parse --verify "master@{2005-05-28}" >o 2>e &&
         test $D = $(cat o) &&
         test "warning: Log .git/logs/$m unexpectedly ended on $ld." = "$(cat e)"'
 
+
+rm -f .git/$m .git/logs/$m expect
+
+test_expect_success \
+    'creating initial files' \
+    'echo TEST >F &&
+     git-add F &&
+        GIT_AUTHOR_DATE="2005-05-26 23:30" \
+        GIT_COMMITTER_DATE="2005-05-26 23:30" git-commit -m add -a &&
+        h_TEST=$(git-rev-parse --verify HEAD)
+        echo The other day this did not work. >M &&
+        echo And then Bob told me how to fix it. >>M &&
+        echo OTHER >F &&
+        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)
+        rm -f M'
+
+cat >expect <<EOF
+$Z $h_TEST $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 commit (initial): add
+$h_TEST $h_OTHER $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000   commit: The other day this did not work.
+$h_OTHER $h_FIXED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151040 +0000  commit (amend): The other day this did not work.
+$h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000 commit (merge): Merged initial commit and a later commit.
+EOF
+test_expect_success \
+       'git-commit logged updates' \
+       'diff expect .git/logs/$m'
+unset h_TEST h_OTHER h_FIXED h_MERGED
+
+test_expect_success \
+       'git-cat-file blob master:F (expect OTHER)' \
+       'test OTHER = $(git-cat-file blob master:F)'
+test_expect_success \
+       'git-cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' \
+       'test TEST = $(git-cat-file blob "master@{2005-05-26 23:30}:F")'
+test_expect_success \
+       'git-cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' \
+       'test OTHER = $(git-cat-file blob "master@{2005-05-26 23:42}:F")'
+
 test_done