mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/allow-fetch-onelevel-refname' into maint

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2014-02-13 13:38:34 -08:00
parent 21261fabdd 4c22408111
commit c337684842
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fetch-pack.c
View File

@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args,
next = ref->next; next = ref->next;
if (!memcmp(ref->name, "refs/", 5) && if (!memcmp(ref->name, "refs/", 5) &&
check_refname_format(ref->name + 5, 0)) check_refname_format(ref->name, 0))
; /* trash */ ; /* trash */
else { else {
while (i < nr_sought) { while (i < nr_sought) {

11
t/t5510-fetch.sh
View File

@ -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_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 test_done