Merge branch 'js/replace-edit-use-editor-configuration'

diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index 300f8bf25c34cf4ea4e011d1daa525285ca94c5a..c5501b008c8f56ac0712d9f475ebc460a0d4eea4 100755 (executable)
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -19,4 +19,43 @@ test_expect_success 'checkout master from invalid HEAD' '
        git checkout master --
 '
 
+test_expect_success 'checkout notices failure to lock HEAD' '
+       test_when_finished "rm -f .git/HEAD.lock" &&
+       >.git/HEAD.lock &&
+       test_must_fail git checkout -b other
+'
+
+test_expect_success 'create ref directory/file conflict scenario' '
+       git update-ref refs/heads/outer/inner master &&
+
+       # do not rely on symbolic-ref to get a known state,
+       # as it may use the same code we are testing
+       reset_to_df () {
+               echo "ref: refs/heads/outer" >.git/HEAD
+       }
+'
+
+test_expect_success 'checkout away from d/f HEAD (unpacked, to branch)' '
+       reset_to_df &&
+       git checkout master
+'
+
+test_expect_success 'checkout away from d/f HEAD (unpacked, to detached)' '
+       reset_to_df &&
+       git checkout --detach master
+'
+
+test_expect_success 'pack refs' '
+       git pack-refs --all --prune
+'
+
+test_expect_success 'checkout away from d/f HEAD (packed, to branch)' '
+       reset_to_df &&
+       git checkout master
+'
+
+test_expect_success 'checkout away from d/f HEAD (packed, to detached)' '
+       reset_to_df &&
+       git checkout --detach master
+'
 test_done