checkout -p: handle tree arguments correctly again

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

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index e1197ac8189b942a3ab17511b30d97069c5c597e..27171f826129168aa1e52262e2b2a9b4ca327989 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -37,15 +37,15 @@ test_expect_success setup '
 
 test_expect_success "create $m" '
        git update-ref $m $A &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "create $m with oldvalue verification" '
        git update-ref $m $B $A &&
-       test $B = $(cat .git/$m)
+       test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "fail to delete $m with stale ref" '
        test_must_fail git update-ref -d $m $A &&
-       test $B = "$(cat .git/$m)"
+       test $B = "$(git show-ref -s --verify $m)"
 '
 test_expect_success "delete $m" '
        test_when_finished "rm -f .git/$m" &&
@@ -56,7 +56,7 @@ test_expect_success "delete $m" '
 test_expect_success "delete $m without oldvalue verification" '
        test_when_finished "rm -f .git/$m" &&
        git update-ref $m $A &&
-       test $A = $(cat .git/$m) &&
+       test $A = $(git show-ref -s --verify $m) &&
        git update-ref -d $m &&
        test_path_is_missing .git/$m
 '
@@ -69,15 +69,15 @@ test_expect_success "fail to create $n" '
 
 test_expect_success "create $m (by HEAD)" '
        git update-ref HEAD $A &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "create $m (by HEAD) with oldvalue verification" '
        git update-ref HEAD $B $A &&
-       test $B = $(cat .git/$m)
+       test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "fail to delete $m (by HEAD) with stale ref" '
        test_must_fail git update-ref -d HEAD $A &&
-       test $B = $(cat .git/$m)
+       test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "delete $m (by HEAD)" '
        test_when_finished "rm -f .git/$m" &&
@@ -178,14 +178,14 @@ test_expect_success '--no-create-reflog overrides core.logAllRefUpdates=always'
 
 test_expect_success "create $m (by HEAD)" '
        git update-ref HEAD $A &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success 'pack refs' '
        git pack-refs --all
 '
 test_expect_success "move $m (by HEAD)" '
        git update-ref HEAD $B $A &&
-       test $B = $(cat .git/$m)
+       test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" '
        test_when_finished "rm -f .git/$m" &&
@@ -255,7 +255,7 @@ test_expect_success '(not) change HEAD with wrong SHA1' '
 '
 test_expect_success "(not) changed .git/$m" '
        test_when_finished "rm -f .git/$m" &&
-       ! test $B = $(cat .git/$m)
+       ! test $B = $(git show-ref -s --verify $m)
 '
 
 rm -f .git/logs/refs/heads/master
@@ -263,19 +263,19 @@ test_expect_success "create $m (logged by touch)" '
        test_config core.logAllRefUpdates false &&
        GIT_COMMITTER_DATE="2005-05-26 23:30" \
        git update-ref --create-reflog HEAD $A -m "Initial Creation" &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "update $m (logged by touch)" '
        test_config core.logAllRefUpdates false &&
        GIT_COMMITTER_DATE="2005-05-26 23:31" \
        git update-ref HEAD $B $A -m "Switch" &&
-       test $B = $(cat .git/$m)
+       test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "set $m (logged by touch)" '
        test_config core.logAllRefUpdates false &&
        GIT_COMMITTER_DATE="2005-05-26 23:41" \
        git update-ref HEAD $A &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 
 test_expect_success 'empty directory removal' '
@@ -319,19 +319,19 @@ test_expect_success "create $m (logged by config)" '
        test_config core.logAllRefUpdates true &&
        GIT_COMMITTER_DATE="2005-05-26 23:32" \
        git update-ref HEAD $A -m "Initial Creation" &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "update $m (logged by config)" '
        test_config core.logAllRefUpdates true &&
        GIT_COMMITTER_DATE="2005-05-26 23:33" \
        git update-ref HEAD'" $B $A "'-m "Switch" &&
-       test $B = $(cat .git/$m)
+       test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "set $m (logged by config)" '
        test_config core.logAllRefUpdates true &&
        GIT_COMMITTER_DATE="2005-05-26 23:43" \
        git update-ref HEAD $A &&
-       test $A = $(cat .git/$m)
+       test $A = $(git show-ref -s --verify $m)
 '
 
 cat >expect <<EOF