Git 2.4.9

diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh
index 2541a231bc81680c5b0735167b365022ebfbca3b..66bafb5cf41775a27abf6f9de3eeca4f01887e79 100755 (executable)
--- a/t/t1404-update-ref-df-conflicts.sh
+++ b/t/t1404-update-ref-df-conflicts.sh
@@ -36,7 +36,7 @@ test_expect_success 'existing loose ref is a simple prefix of new' '
 
        prefix=refs/1l &&
        test_update_rejected $prefix "a c e" false "b c/x d" \
-               "unable to resolve reference $prefix/c/x: Not a directory"
+               "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
 
 '
 
@@ -52,7 +52,7 @@ test_expect_success 'existing loose ref is a deeper prefix of new' '
 
        prefix=refs/2l &&
        test_update_rejected $prefix "a c e" false "b c/x/y d" \
-               "unable to resolve reference $prefix/c/x/y: Not a directory"
+               "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
 
 '
 
@@ -68,7 +68,7 @@ test_expect_success 'new ref is a simple prefix of existing loose' '
 
        prefix=refs/3l &&
        test_update_rejected $prefix "a c/x e" false "b c d" \
-               "there are still refs under $Q$prefix/c$Q"
+               "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
 
 '
 
@@ -84,7 +84,7 @@ test_expect_success 'new ref is a deeper prefix of existing loose' '
 
        prefix=refs/4l &&
        test_update_rejected $prefix "a c/x/y e" false "b c d" \
-               "there are still refs under $Q$prefix/c$Q"
+               "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
 
 '
 
@@ -96,7 +96,7 @@ test_expect_success 'new ref is a deeper prefix of existing packed' '
 
 '
 
-test_expect_failure 'one new ref is a simple prefix of another' '
+test_expect_success 'one new ref is a simple prefix of another' '
 
        prefix=refs/5 &&
        test_update_rejected $prefix "a e" false "b c c/x d" \