git on Mac OS and precomposed unicode

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 5d1c66ea7166b0b4d631b681f344e0eefb84d899..e8af615e6dcdf365416ef9f71825c17a0d601186 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -107,16 +107,18 @@ test_expect_success 'remove remote' '
 )
 '
 
-test_expect_success 'remove remote protects non-remote branches' '
+test_expect_success 'remove remote protects local branches' '
 (
        cd test &&
        { cat >expect1 <<EOF
-Note: A non-remote branch was not removed; to delete it, use:
+Note: A branch outside the refs/remotes/ hierarchy was not removed;
+to delete it, use:
   git branch -d master
 EOF
        } &&
        { cat >expect2 <<EOF
-Note: Non-remote branches were not removed; to delete them, use:
+Note: Some branches outside the refs/remotes/ hierarchy were not removed;
+to delete them, use:
   git branch -d foobranch
   git branch -d master
 EOF
@@ -302,6 +304,106 @@ test_expect_success 'add --mirror && prune' '
         git rev-parse --verify refs/heads/side)
 '
 
+test_expect_success 'add --mirror=fetch' '
+       mkdir mirror-fetch &&
+       git init mirror-fetch/parent &&
+       (cd mirror-fetch/parent &&
+        test_commit one) &&
+       git init --bare mirror-fetch/child &&
+       (cd mirror-fetch/child &&
+        git remote add --mirror=fetch -f parent ../parent)
+'
+
+test_expect_success 'fetch mirrors act as mirrors during fetch' '
+       (cd mirror-fetch/parent &&
+        git branch new &&
+        git branch -m master renamed
+       ) &&
+       (cd mirror-fetch/child &&
+        git fetch parent &&
+        git rev-parse --verify refs/heads/new &&
+        git rev-parse --verify refs/heads/renamed
+       )
+'
+
+test_expect_success 'fetch mirrors can prune' '
+       (cd mirror-fetch/child &&
+        git remote prune parent &&
+        test_must_fail git rev-parse --verify refs/heads/master
+       )
+'
+
+test_expect_success 'fetch mirrors do not act as mirrors during push' '
+       (cd mirror-fetch/parent &&
+        git checkout HEAD^0
+       ) &&
+       (cd mirror-fetch/child &&
+        git branch -m renamed renamed2 &&
+        git push parent
+       ) &&
+       (cd mirror-fetch/parent &&
+        git rev-parse --verify renamed &&
+        test_must_fail git rev-parse --verify refs/heads/renamed2
+       )
+'
+
+test_expect_success 'add fetch mirror with specific branches' '
+       git init --bare mirror-fetch/track &&
+       (cd mirror-fetch/track &&
+        git remote add --mirror=fetch -t heads/new parent ../parent
+       )
+'
+
+test_expect_success 'fetch mirror respects specific branches' '
+       (cd mirror-fetch/track &&
+        git fetch parent &&
+        git rev-parse --verify refs/heads/new &&
+        test_must_fail git rev-parse --verify refs/heads/renamed
+       )
+'
+
+test_expect_success 'add --mirror=push' '
+       mkdir mirror-push &&
+       git init --bare mirror-push/public &&
+       git init mirror-push/private &&
+       (cd mirror-push/private &&
+        test_commit one &&
+        git remote add --mirror=push public ../public
+       )
+'
+
+test_expect_success 'push mirrors act as mirrors during push' '
+       (cd mirror-push/private &&
+        git branch new &&
+        git branch -m master renamed &&
+        git push public
+       ) &&
+       (cd mirror-push/private &&
+        git rev-parse --verify refs/heads/new &&
+        git rev-parse --verify refs/heads/renamed &&
+        test_must_fail git rev-parse --verify refs/heads/master
+       )
+'
+
+test_expect_success 'push mirrors do not act as mirrors during fetch' '
+       (cd mirror-push/public &&
+        git branch -m renamed renamed2 &&
+        git symbolic-ref HEAD refs/heads/renamed2
+       ) &&
+       (cd mirror-push/private &&
+        git fetch public &&
+        git rev-parse --verify refs/heads/renamed &&
+        test_must_fail git rev-parse --verify refs/heads/renamed2
+       )
+'
+
+test_expect_success 'push mirrors do not allow you to specify refs' '
+       git init mirror-push/track &&
+       (cd mirror-push/track &&
+        test_must_fail git remote add --mirror=push -t new public ../public
+       )
+'
+
 test_expect_success 'add alt && prune' '
        (mkdir alttst &&
         cd alttst &&
@@ -529,6 +631,37 @@ test_expect_success 'rename a remote' '
 
 '
 
+test_expect_success 'rename does not update a non-default fetch refspec' '
+
+       git clone one four.one &&
+       (cd four.one &&
+        git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
+        git remote rename origin upstream &&
+        test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
+        git rev-parse -q origin/master)
+
+'
+
+test_expect_success 'rename a remote with name part of fetch spec' '
+
+       git clone one four.two &&
+       (cd four.two &&
+        git remote rename origin remote &&
+        git remote rename remote upstream &&
+        test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*")
+
+'
+
+test_expect_success 'rename a remote with name prefix of other remote' '
+
+       git clone one four.three &&
+       (cd four.three &&
+        git remote add o git://example.com/repo.git &&
+        git remote rename o upstream &&
+        test "$(git rev-parse origin/master)" = "$(git rev-parse master)")
+
+'
+
 cat > remotes_origin << EOF
 URL: $(pwd)/one
 Push: refs/heads/master:refs/heads/upstream