[PATCH v4] receive-pack: Create a HEAD ref for ref namespace
From: Johannes Löthberg <hidden>
Date: 2016-06-15 23:05:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Each ref namespace have their own separate branches, tags, and HEAD, so
when pushing to a namespace we need to make sure that there exists a
HEAD ref for the namespace, otherwise you will not be able to check out
the repo after cloning from a namespace
Signed-off-by: Johannes Löthberg <redacted>
---
Changes since v3:
test:
* Use a single printf statement
* Check that the contents of the file and sha of the commits in the
initial and cloned repositories matches
builtin/receive-pack.c | 12 +++++++++-
t/t5509-fetch-push-namespaces.sh | 50 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index d2ec52b..0c18c92 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c@@ -864,7 +864,9 @@ static const char *update(struct command *cmd, struct shallow_info *si) { const char *name = cmd->ref_name; struct strbuf namespaced_name_buf = STRBUF_INIT; - const char *namespaced_name, *ret; + struct strbuf namespaced_head_buf = STRBUF_INIT; + const char *namespaced_name, *ret, *namespace; + const char *namespaced_head_path; unsigned char *old_sha1 = cmd->old_sha1; unsigned char *new_sha1 = cmd->new_sha1;
@@ -981,6 +983,14 @@ static const char *update(struct command *cmd, struct shallow_info *si) return NULL; /* good */ } else { + namespace = get_git_namespace(); + if (strcmp(namespace, "refs/namespaces/")) { + strbuf_addf(&namespaced_head_buf, "%s%s", namespace, "HEAD"); + namespaced_head_path = strbuf_detach(&namespaced_head_buf, NULL); + + create_symref(namespaced_head_path, namespaced_name, NULL); + } + struct strbuf err = STRBUF_INIT; if (shallow_update && si->shallow_ref[cmd->index] && update_shallow_ref(cmd, si))
diff --git a/t/t5509-fetch-push-namespaces.sh b/t/t5509-fetch-push-namespaces.sh
index cc0b31f..88c8aa9 100755
--- a/t/t5509-fetch-push-namespaces.sh
+++ b/t/t5509-fetch-push-namespaces.sh@@ -1,6 +1,7 @@ #!/bin/sh -test_description='fetch/push involving ref namespaces' +test_description='fetch/push/clone involving ref namespaces' + . ./test-lib.sh test_expect_success setup '
@@ -82,4 +83,51 @@ test_expect_success 'mirroring a repository using a ref namespace' ' ) ' +test_expect_success 'cloning from ref namespace' ' + rm -rf initial bare clone && + git init initial && + git init --bare bare && + ( + cd initial && + echo "commit one" >file && + git add file && + git commit -m "commit one" && + git push ../bare master && + + echo refs/heads/master >expect && + git -C ../bare symbolic-ref HEAD >actual && + test_cmp expect actual && + + git rev-parse HEAD >expect && + git -C ../bare rev-parse HEAD >actual && + test_cmp expect actual && + + echo "commit two" >>file && + git add file && + git commit -m "commit two" && + GIT_NAMESPACE=new_namespace git push ../bare master && + + echo "ref: refs/namespaces/new_namespace/refs/heads/master" >expect && + test_cmp expect ../bare/refs/namespaces/new_namespace/HEAD && + + printf "%s commit\t%s\n" \ + $(git rev-parse master^) refs/heads/master \ + $(git rev-parse master) refs/namespaces/new_namespace/HEAD \ + $(git rev-parse master) refs/namespaces/new_namespace/refs/heads/master >expect && + git -C ../bare for-each-ref refs/ >actual && + test_cmp expect actual + ) && + GIT_NAMESPACE=new_namespace git clone bare clone && + ( + git -C initial cat-file blob master:file >expect && + git -C clone cat-file blob master:file >actual && + test_cmp expect actual && + + git -C initial rev-parse master >expect && + git -C clone rev-parse master >actual && + test_cmp expect actual + ) +' + + test_done
--
2.4.2