diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:14 -0800 |
| commit | f583ace15762e2f9f68ccfcf0ec0e0527b2a899d (patch) | |
| tree | 20e6d8713acc48a294d445260fffd8603736bca9 | |
| parent | Merge branch 'jc/revision-range-unpeel' (diff) | |
| parent | fetch-pack: do not filter out one-level refs (diff) | |
| download | tgif-f583ace15762e2f9f68ccfcf0ec0e0527b2a899d.tar.xz | |
Merge branch 'jk/allow-fetch-onelevel-refname'
"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.c | 2 | ||||
| -rwxr-xr-x | t/t5510-fetch.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index d52de74c4b..90fdd49821 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -506,7 +506,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 12674ac098..ab28594c62 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -640,4 +640,15 @@ test_expect_success 'branchname D/F conflict resolved by --prune' ' test_cmp expect actual ' +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 |