summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 13:38:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 13:38:34 -0800
commitc337684842e37d2422aa75b04ca1a3ee6d4a8ef0 (patch)
tree882018e8141e0abfe625832b3cebab0f406925b4
parentMerge branch 'jk/interpret-branch-name-fix' into maint (diff)
parentfetch-pack: do not filter out one-level refs (diff)
downloadtgif-c337684842e37d2422aa75b04ca1a3ee6d4a8ef0.tar.xz
Merge branch 'jk/allow-fetch-onelevel-refname' into maint
"git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * jk/allow-fetch-onelevel-refname: fetch-pack: do not filter out one-level refs
-rw-r--r--fetch-pack.c2
-rwxr-xr-xt/t5510-fetch.sh11
2 files changed, 12 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index 1042448fa0..fab5e80175 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args,
next = ref->next;
if (!memcmp(ref->name, "refs/", 5) &&
- check_refname_format(ref->name + 5, 0))
+ check_refname_format(ref->name, 0))
; /* trash */
else {
while (i < nr_sought) {
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 1f0f8e6827..07986d94bd 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -594,4 +594,15 @@ test_expect_success 'all boundary commits are excluded' '
test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
'
+test_expect_success 'fetching a one-level ref works' '
+ test_commit extra &&
+ git reset --hard HEAD^ &&
+ git update-ref refs/foo extra &&
+ git init one-level &&
+ (
+ cd one-level &&
+ git fetch .. HEAD refs/foo
+ )
+'
+
test_done