Re: [PATCH 6/6] transport-helper: update remote helper namespace

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Apr 18, 2013, 04:14 UTC
Message-ID: <CAMP44s05XMWO=HTDj-tBiEpXozJk7Q9e3+9d0d0U5bseGWTyzg@mail.gmail.com>
In-Reply-To: <1366243524-18202-7-git-send-email-felipe.contreras@gmail.com>

On Wed, Apr 17, 2013 at 7:05 PM, Felipe Contreras <felipe.contreras@gmail.com> wrote:

Show 15 quoted lines

> --- a/t/t5801-remote-helpers.sh
> +++ b/t/t5801-remote-helpers.sh
> @@ -153,4 +153,16 @@ test_expect_success 'push ref with existing object' '
>         compare_refs local dup server dup
>  '
>
> +test_expect_success 'push update refs' '
> +       (cd local &&
> +       git checkout -b update master &&
> +       echo update >>file &&
> +       git commit -a -m update &&
> +       git push origin update
> +       git rev-parse --verify testgit/origin/heads/update >expect &&
> +       git rev-parse --verify remotes/origin/update >actual
> +       test_cmp expect actual

Slightly confusing and a bit buggy:

-       git rev-parse --verify testgit/origin/heads/update >expect &&
-       git rev-parse --verify remotes/origin/update >actual
+       git rev-parse --verify remotes/origin/update >expect &&
+       git rev-parse --verify testgit/origin/heads/update >actual &&

Show 14 quoted lines

>  static void push_update_refs_status(struct helper_data *data,
> @@ -708,11 +710,21 @@ static void push_update_refs_status(struct helper_data *data,
>         struct strbuf buf = STRBUF_INIT;
>         struct ref *ref = remote_refs;
>         for (;;) {
> +               char *private;
> +
>                 recvline(data, &buf);
>                 if (!buf.len)
>                         break;
>
> -               push_update_ref_status(&buf, &ref, remote_refs);
> +               if (push_update_ref_status(&buf, &ref, remote_refs))
> +                       continue;

Actually, since this function is also used by push_with_push:

               if (!data->refspecs)
                       continue;

I had it in my previous series but removed it.

I'll reroll.

-- 
Felipe Contreras