diffcore-pickaxe: support case insensitive match on non-ascii

diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh
index ea49dedbf8867694d83cd550c8212ff107361920..02f160aae0c414411572a99a148d2b039c24fdd3 100755 (executable)
--- a/t/t5517-push-mirror.sh
+++ b/t/t5517-push-mirror.sh
@@ -4,7 +4,7 @@ test_description='pushing to a mirror repository'
 
 . ./test-lib.sh
 
-D=`pwd`
+D=$(pwd)
 
 invert () {
        if "$@"; then
@@ -19,7 +19,8 @@ mk_repo_pair () {
        mkdir mirror &&
        (
                cd mirror &&
-               git init
+               git init &&
+               git config receive.denyCurrentBranch warn
        ) &&
        mkdir master &&
        (
@@ -255,7 +256,7 @@ test_expect_success 'remote.foo.mirror=no has no effect' '
                git branch keep master &&
                git push --mirror up &&
                git branch -D keep &&
-               git push up
+               git push up :
        ) &&
        (
                cd mirror &&