On Wed, Apr 17, 2013 at 7:05 PM, Felipe Contreras
<felipe.contreras@xxxxxxxxx> wrote:
> --- 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 &&
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html