clone: the given repository dir should be relative to $PWD

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index df3e9933658595c2690d4b83e3d5adb2289b887f..b3b920edb146c3ad1ed8c795150c162a9e3f0e17 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -14,44 +14,56 @@ D=4444444444444444444444444444444444444444
 E=5555555555555555555555555555555555555555
 F=6666666666666666666666666666666666666666
 m=refs/heads/master
+n_dir=refs/heads/gu
+n=$n_dir/fixes
 
 test_expect_success \
        "create $m" \
-       'git-update-ref $m $A &&
-        test $A = $(cat .git/$m)'
+       "git-update-ref $m $A &&
+        test $A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "create $m" \
-       'git-update-ref $m $B $A &&
-        test $B = $(cat .git/$m)'
+       "git-update-ref $m $B $A &&
+        test $B"' = $(cat .git/'"$m"')'
 rm -f .git/$m
 
+test_expect_success \
+       "fail to create $n" \
+       "touch .git/$n_dir
+        git-update-ref $n $A >out 2>err
+        test "'$? = 1 &&
+        test "" = "$(cat out)" &&
+        grep "error: unable to resolve reference" err &&
+        grep '"$n err"
+rm -f .git/$n_dir out err
+
 test_expect_success \
        "create $m (by HEAD)" \
-       'git-update-ref HEAD $A &&
-        test $A = $(cat .git/$m)'
+       "git-update-ref HEAD $A &&
+        test $A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "create $m (by HEAD)" \
-       'git-update-ref HEAD $B $A &&
-        test $B = $(cat .git/$m)'
+       "git-update-ref HEAD $B $A &&
+        test $B"' = $(cat .git/'"$m"')'
 rm -f .git/$m
 
 test_expect_failure \
        '(not) create HEAD with old sha1' \
-       'git-update-ref HEAD $A $B'
+       "git-update-ref HEAD $A $B"
 test_expect_failure \
        "(not) prior created .git/$m" \
-       'test -f .git/$m'
+       "test -f .git/$m"
 rm -f .git/$m
 
 test_expect_success \
        "create HEAD" \
-       'git-update-ref HEAD $A'
+       "git-update-ref HEAD $A"
 test_expect_failure \
        '(not) change HEAD with wrong SHA1' \
-       'git-update-ref HEAD $B $Z'
+       "git-update-ref HEAD $B $Z"
 test_expect_failure \
        "(not) changed .git/$m" \
-       'test $B = $(cat .git/$m)'
+       "test $B"' = $(cat .git/'"$m"')'
 rm -f .git/$m
 
 mkdir -p .git/logs/refs/heads
@@ -59,18 +71,18 @@ touch .git/logs/refs/heads/master
 test_expect_success \
        "create $m (logged by touch)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:30" \
-        git-update-ref HEAD $A -m "Initial Creation" &&
-        test $A = $(cat .git/$m)'
+        git-update-ref HEAD '"$A"' -m "Initial Creation" &&
+        test '"$A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "update $m (logged by touch)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:31" \
-        git-update-ref HEAD $B $A -m "Switch" &&
-        test $B = $(cat .git/$m)'
+        git-update-ref HEAD'" $B $A "'-m "Switch" &&
+        test '"$B"' = $(cat .git/'"$m"')'
 test_expect_success \
        "set $m (logged by touch)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:41" \
-        git-update-ref HEAD $A &&
-        test $A = $(cat .git/$m)'
+        git-update-ref HEAD'" $A &&
+        test $A"' = $(cat .git/'"$m"')'
 
 cat >expect <<EOF
 $Z $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000      Initial Creation
@@ -79,7 +91,7 @@ $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000
 EOF
 test_expect_success \
        "verifying $m's log" \
-       'diff expect .git/logs/$m'
+       "diff expect .git/logs/$m"
 rm -rf .git/$m .git/logs expect
 
 test_expect_success \
@@ -90,18 +102,18 @@ test_expect_success \
 test_expect_success \
        "create $m (logged by config)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:32" \
-        git-update-ref HEAD $A -m "Initial Creation" &&
-        test $A = $(cat .git/$m)'
+        git-update-ref HEAD'" $A "'-m "Initial Creation" &&
+        test '"$A"' = $(cat .git/'"$m"')'
 test_expect_success \
        "update $m (logged by config)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:33" \
-        git-update-ref HEAD $B $A -m "Switch" &&
-        test $B = $(cat .git/$m)'
+        git-update-ref HEAD'" $B $A "'-m "Switch" &&
+        test '"$B"' = $(cat .git/'"$m"')'
 test_expect_success \
        "set $m (logged by config)" \
        'GIT_COMMITTER_DATE="2005-05-26 23:43" \
-        git-update-ref HEAD $A &&
-        test $A = $(cat .git/$m)'
+        git-update-ref HEAD '"$A &&
+        test $A"' = $(cat .git/'"$m"')'
 
 cat >expect <<EOF
 $Z $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 +0000      Initial Creation
@@ -128,50 +140,50 @@ test_expect_success \
        'Query "master@{May 25 2005}" (before history)' \
        'rm -f o 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 '"$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)" \
        'rm -f o 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 '"$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)' \
        'rm -f o 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 '"$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)' \
        'rm -f o e
         git-rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
-        test $A = $(cat o) &&
+        test '"$A"' = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
        '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 &&
-        test $B = $(cat o) &&
-        test "warning: Log .git/logs/$m has gap after $gd." = "$(cat 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:38:00}" (middle of history)' \
        'rm -f o e
         git-rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
-        test $Z = $(cat o) &&
+        test '"$Z"' = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
        '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 &&
-        test $E = $(cat o) &&
+        test '"$E"' = $(cat o) &&
         test "" = "$(cat e)"'
 test_expect_success \
        'Query "master@{2005-05-28}" (past end of history)' \
        'rm -f o 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)"'
+        test '"$D"' = $(cat o) &&
+        test "warning: Log .git/logs/'"$m unexpectedly ended on $ld"'." = "$(cat e)"'
 
 
 rm -f .git/$m .git/logs/$m expect
@@ -188,17 +200,29 @@ test_expect_success \
         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)
+        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: add
+$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
+       "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)' \