xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index fd5f284e9ae3d83a57f7ccdc74292c939bb0d352..9d2dc33cbd0d1df19b0a9003e545104a982da694 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -274,9 +274,8 @@ test_expect_success 'push with HEAD nonexisting at remote' '
 test_expect_success 'push with dry-run' '
 
        mk_test heads/master &&
-       cd testrepo &&
-       old_commit=$(git show-ref -s --verify refs/heads/master) &&
-       cd .. &&
+       (cd testrepo &&
+        old_commit=$(git show-ref -s --verify refs/heads/master)) &&
        git push --dry-run testrepo &&
        check_push_result $old_commit heads/master
 '
@@ -284,28 +283,40 @@ test_expect_success 'push with dry-run' '
 test_expect_success 'push updates local refs' '
 
        rm -rf parent child &&
-       mkdir parent && cd parent && git init &&
-               echo one >foo && git add foo && git commit -m one &&
-       cd .. &&
-       git clone parent child && cd child &&
+       mkdir parent &&
+       (cd parent && git init &&
+               echo one >foo && git add foo && git commit -m one) &&
+       git clone parent child &&
+       (cd child &&
                echo two >foo && git commit -a -m two &&
                git push &&
-       test $(git rev-parse master) = $(git rev-parse remotes/origin/master)
+       test $(git rev-parse master) = $(git rev-parse remotes/origin/master))
 
 '
 
 test_expect_success 'push does not update local refs on failure' '
 
        rm -rf parent child &&
-       mkdir parent && cd parent && git init &&
+       mkdir parent &&
+       (cd parent && git init &&
                echo one >foo && git add foo && git commit -m one &&
                echo exit 1 >.git/hooks/pre-receive &&
-               chmod +x .git/hooks/pre-receive &&
-       cd .. &&
-       git clone parent child && cd child &&
-               echo two >foo && git commit -a -m two || exit 1
-               git push && exit 1
-       test $(git rev-parse master) != $(git rev-parse remotes/origin/master)
+               chmod +x .git/hooks/pre-receive) &&
+       git clone parent child &&
+       (cd child &&
+               echo two >foo && git commit -a -m two &&
+               ! git push &&
+               test $(git rev-parse master) != \
+                       $(git rev-parse remotes/origin/master))
+
+'
+
+test_expect_success 'allow deleting an invalid remote ref' '
+
+       pwd &&
+       rm -f testrepo/.git/objects/??/* &&
+       git push testrepo :refs/heads/master &&
+       (cd testrepo && ! git rev-parse --verify refs/heads/master)
 
 '