Merge branch 'js/mingw-getcwd'

diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 823fe1d79924b68950a59ffde902b16db29205b6..492edffa9cfb626b4747ead04251fc33b0502ac9 100755 (executable)
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -85,8 +85,7 @@ test_expect_success 'fails silently when using -q' '
 
 test_expect_success 'fails silently when using -q with deleted reflogs' '
        ref=$(git rev-parse HEAD) &&
-       : >.git/logs/refs/test &&
-       git update-ref -m "message for refs/test" refs/test "$ref" &&
+       git update-ref --create-reflog -m "message for refs/test" refs/test "$ref" &&
        git reflog delete --updateref --rewrite refs/test@{0} &&
        test_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&
        test_must_be_empty error
@@ -94,16 +93,14 @@ test_expect_success 'fails silently when using -q with deleted reflogs' '
 
 test_expect_success 'fails silently when using -q with not enough reflogs' '
        ref=$(git rev-parse HEAD) &&
-       : >.git/logs/refs/test2 &&
-       git update-ref -m "message for refs/test2" refs/test2 "$ref" &&
+       git update-ref --create-reflog -m "message for refs/test2" refs/test2 "$ref" &&
        test_must_fail git rev-parse -q --verify refs/test2@{999} >error 2>&1 &&
        test_must_be_empty error
 '
 
 test_expect_success 'succeeds silently with -q and reflogs that do not go far back enough in time' '
        ref=$(git rev-parse HEAD) &&
-       : >.git/logs/refs/test3 &&
-       git update-ref -m "message for refs/test3" refs/test3 "$ref" &&
+       git update-ref --create-reflog -m "message for refs/test3" refs/test3 "$ref" &&
        git rev-parse -q --verify refs/test3@{1.year.ago} >actual 2>error &&
        test_must_be_empty error &&
        echo "$ref" >expect &&
@@ -142,4 +139,9 @@ test_expect_success 'master@{n} for various n' '
        test_must_fail git rev-parse --verify master@{$Np1}
 '
 
+test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
+       ln -s does-not-exist .git/refs/heads/broken &&
+       test_must_fail git rev-parse --verify broken
+'
+
 test_done