On 08/20/2012 07:39 PM, Junio C Hamano wrote:
> There are a handful of places where we call check_refname_format() on a
> substring after "refs/" of a refname we are going to use, and filter out a
> valid match with "refs/stash" with such a pathspec. Not sending a stash
> may arguably be a feature (as stash is inherently a local workflow
> element), but the code in the transport layer is oblivious to this
> filtering performed by the lower layer of the code, and complains that the
> other side did not send all the objects that needs to complete refs/stash
> at the end, even though the code will not write refs/stash out anyway, and
> making the whole command fail.
>
> This is an attempt to "fix" it by using check_refname_format() on the
> whole "refs/....." string and allowing refs/stash to be also copied.
>
> Signed-off-by: Junio C Hamano <[email protected]>
> ---
> builtin/fetch-pack.c | 2 +-
> builtin/receive-pack.c | 2 +-
> connect.c | 8 ++------
> remote.c | 2 +-
> t/t5516-fetch-push.sh | 33 +++++++++++++++++++++++++++++++++
> 5 files changed, 38 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
> index 6207ecd..a3e3fa3 100644
> --- a/builtin/fetch-pack.c
> +++ b/builtin/fetch-pack.c
> @@ -546,7 +546,7 @@ static void filter_refs(struct ref **refs, int nr_match,
> char **match)
> for (ref = *refs; ref; ref = next) {
> next = ref->next;
> if (!memcmp(ref->name, "refs/", 5) &&
> - check_refname_format(ref->name + 5, 0))
> + check_refname_format(ref->name, 0))
> ; /* trash */
> else if (args.fetch_all &&
> (!args.depth || prefixcmp(ref->name, "refs/tags/") )) {
I understand that you didn't introduce this code, but it seems like a
suspicious combination of conditions:
if ((ref->name starts with "refs/")
and (ref->name has invalid format))
It would seem more plausible to want
if ((ref->name starts with "refs/")
and (ref->name has *valid* format))
or its logical inverse
if ((ref->name does not start with "refs/")
or (ref->name has invalid format))
If you know the purpose of the code here, maybe you could give it a
quick sanity check. (I believe the test was originally introduced by
Dscho in 1baaae5e1f9ac09aafe11b5aa4daa69bae68173b.)
> diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
> index 7ec68a1..1935b80 100644
> --- a/builtin/receive-pack.c
> +++ b/builtin/receive-pack.c
> @@ -401,7 +401,7 @@ static const char *update(struct command *cmd)
> struct ref_lock *lock;
>
> /* only refs/... are allowed */
> - if (prefixcmp(name, "refs/") || check_refname_format(name + 5, 0)) {
> + if (prefixcmp(name, "refs/") || check_refname_format(name, 0)) {
> rp_error("refusing to create funny ref '%s' remotely", name);
> return "funny refname";
> }
> diff --git a/connect.c b/connect.c
> index c8d0ea5..b30639c 100644
> --- a/connect.c
> +++ b/connect.c
> @@ -17,20 +17,16 @@ static int check_ref(const char *name, int len, unsigned
> int flags)
> if (len < 5 || memcmp(name, "refs/", 5))
> return 0;
>
> - /* Skip the "refs/" part */
> - name += 5;
> - len -= 5;
> -
> /* REF_NORMAL means that we don't want the magic fake tag refs */
> if ((flags & REF_NORMAL) && check_refname_format(name, 0))
> return 0;
>
> /* REF_HEADS means that we want regular branch heads */
> - if ((flags & REF_HEADS) && !memcmp(name, "heads/", 6))
> + if ((flags & REF_HEADS) && !memcmp(name, "refs/heads/", 11))
> return 1;
>
> /* REF_TAGS means that we want tags */
> - if ((flags & REF_TAGS) && !memcmp(name, "tags/", 5))
> + if ((flags & REF_TAGS) && !memcmp(name, "refs/tags/", 10))
> return 1;
>
> /* All type bits clear means that we are ok with anything */
> diff --git a/remote.c b/remote.c
> index e2ef991..eacd8ad 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -1595,7 +1595,7 @@ static int one_local_ref(const char *refname, const
> unsigned char *sha1, int fla
> int len;
>
> /* we already know it starts with refs/ to get here */
> - if (check_refname_format(refname + 5, 0))
> + if (check_refname_format(refname, 0))
> return 0;
>
> len = strlen(refname) + 1;
> diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
> index b69cf57..3fdfaea 100755
> --- a/t/t5516-fetch-push.sh
> +++ b/t/t5516-fetch-push.sh
> @@ -929,6 +929,39 @@ test_expect_success 'push into aliased refs
> (inconsistent)' '
> )
> '
>
> +test_expect_success 'push all hierarchies with stash' '
> + mk_empty &&
> + git stash clear &&
> + git reset --hard &&
> + echo >>path1 &&
> + git stash save "Tweak path1" &&
> + git push testrepo "refs/*:refs/*" &&
> + # without fix to connect.c::check_ref(), the second push
> + # would fail.
> + git push testrepo refs/stash &&
> + git ls-remote . >expect &&
> + git ls-remote testrepo >actual &&
> + test_cmp actual expect
> +'
> +
> +test_expect_success 'fetch all hierarchies with stash' '
> + mk_empty &&
> + git stash clear &&
> + git reset --hard &&
> + echo >>path1 &&
> + git stash save "Tweak path1" &&
> + (
> + cd testrepo &&
> + git commit --allow-empty -m initial &&
> + git checkout HEAD^0 &&
> + git fetch .. "+refs/*:refs/*" &&
> + git checkout master
> + ) &&
> + git ls-remote . >expect &&
> + git ls-remote testrepo >actual &&
> + test_cmp actual expect
> +'
> +
> test_expect_success 'push --porcelain' '
> mk_empty &&
> echo >.git/foo "To testrepo" &&
>
Otherwise I see nothing wrong with your changes.
Michael
--
Michael Haggerty
[email protected]
http://softwareswirl.blogspot.com/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
