Some users are interested in fetching remote refs into a separate namespace
in the local repo. E.g. instead of the usual remote config:

  [remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = ...

they want to keep remote tags separate from local tags, and they may also
want to fetch other ref types:

  [remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/heads/*
        fetch = +refs/tags/*:refs/remotes/origin/tags/*
        fetch = +refs/notes/*:refs/remotes/origin/notes/*
        fetch = +refs/replace/*:refs/remotes/origin/replace/*
        tagopt = "--no-tags"
        url = ...

This configuration creates a separate namespace under refs/remotes/origin/*
mirroring the structure of local refs (under refs/*) where all the relevant
refs from the 'origin' remote can be found.

This patch introduces a test whose main purpose is to verify that git will
work comfortably with this kind of setup. For now, we only verify that it
is possible (though not exactly easy) to establish a clone with the above
configuration, and that fetching into it yields the expected result.

Signed-off-by: Johan Herland <jo...@herland.net>
---
 t/t7900-working-with-namespaced-remote-refs.sh | 88 ++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100755 t/t7900-working-with-namespaced-remote-refs.sh

diff --git a/t/t7900-working-with-namespaced-remote-refs.sh 
b/t/t7900-working-with-namespaced-remote-refs.sh
new file mode 100755
index 0000000..af03ac9
--- /dev/null
+++ b/t/t7900-working-with-namespaced-remote-refs.sh
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+test_description='testing end-user usability of namespaced remote refs
+
+Set up a local repo with namespaced remote refs, like this:
+
+[remote "origin"]
+       fetch = +refs/heads/*:refs/remotes/origin/heads/*
+       fetch = +refs/tags/*:refs/remotes/origin/tags/*
+       fetch = +refs/notes/*:refs/remotes/origin/notes/*
+       fetch = +refs/replace/*:refs/remotes/origin/replace/*
+       tagopt = "--no-tags"
+       url = ...
+
+Test that the usual end-user operations work as expected with this setup.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'setup server repo' '
+       git init server &&
+       (
+               cd server &&
+               test_commit server_master_a &&
+               git checkout -b other &&
+               test_commit server_other_b &&
+               git checkout master &&
+               test_commit server_master_b
+       )
+'
+
+server_master_a=$(git --git-dir=server/.git rev-parse --verify server_master_a)
+server_master_b=$(git --git-dir=server/.git rev-parse --verify server_master_b)
+server_other_b=$(git --git-dir=server/.git rev-parse --verify server_other_b)
+
+cat > expect.refspecs << EOF
++refs/heads/*:refs/remotes/origin/heads/*
++refs/tags/*:refs/remotes/origin/tags/*
++refs/notes/*:refs/remotes/origin/notes/*
++refs/replace/*:refs/remotes/origin/replace/*
+EOF
+
+cat > expect.show-ref << EOF
+$server_master_b refs/heads/master
+$server_master_b refs/remotes/origin/heads/master
+$server_other_b refs/remotes/origin/heads/other
+$server_master_a refs/remotes/origin/tags/server_master_a
+$server_master_b refs/remotes/origin/tags/server_master_b
+$server_other_b refs/remotes/origin/tags/server_other_b
+EOF
+
+test_clone() {
+       ( cd $1 && git config --get-all remote.origin.fetch ) > actual.refspecs 
&&
+       test_cmp expect.refspecs actual.refspecs &&
+       ( cd $1 && git show-ref ) > actual.show-ref &&
+       test_cmp expect.show-ref actual.show-ref
+}
+
+test_expect_failure 'clone with namespaced remote refs' '
+       git clone server client \
+               --config 
remote.origin.fetch="+refs/heads/*:refs/remotes/origin/heads/*" \
+               --config 
remote.origin.fetch="+refs/tags/*:refs/remotes/origin/tags/*" \
+               --config 
remote.origin.fetch="+refs/notes/*:refs/remotes/origin/notes/*" \
+               --config 
remote.origin.fetch="+refs/replace/*:refs/remotes/origin/replace/*" \
+               --config remote.origin.tagopt "--no-tags" &&
+       test_clone client
+'
+
+# Work-around for the above failure
+test_expect_success 'work-around "clone" with namespaced remote refs' '
+       rm -rf client &&
+       git init client &&
+       (
+               cd client &&
+               git remote add origin ../server &&
+               git config --unset-all remote.origin.fetch &&
+               git config --add remote.origin.fetch 
"+refs/heads/*:refs/remotes/origin/heads/*" &&
+               git config --add remote.origin.fetch 
"+refs/tags/*:refs/remotes/origin/tags/*" &&
+               git config --add remote.origin.fetch 
"+refs/notes/*:refs/remotes/origin/notes/*" &&
+               git config --add remote.origin.fetch 
"+refs/replace/*:refs/remotes/origin/replace/*" &&
+               git config remote.origin.tagopt "--no-tags" &&
+               git fetch &&
+               git checkout master
+       ) &&
+       test_clone client
+'
+
+test_done
-- 
1.8.1.3.704.g33f7d4f

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to