Re: [PATCH v2 3/6] transport-helper: clarify pushing without refspecs
- From
John Keeping <john@keeping.me.uk>
- Date
- Apr 18, 2013, 10:11 UTC
- Message-ID
- <20130418101133.GW2278@serenity.lan>
- In-Reply-To
- <1366258473-12841-4-git-send-email-felipe.contreras@gmail.com>
On Wed, Apr 17, 2013 at 11:14:30PM -0500, Felipe Contreras wrote:
Show 24 quoted lines
> This has never worked, since it's inception the code simply skips all > the refs, essentially telling fast-export to do nothing. > > Let's at least tell the user what's going on. > > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > Documentation/gitremote-helpers.txt | 4 ++-- > t/t5801-remote-helpers.sh | 6 +++--- > transport-helper.c | 5 +++-- > 3 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt > index ba7240c..4d26e37 100644 > --- a/Documentation/gitremote-helpers.txt > +++ b/Documentation/gitremote-helpers.txt > @@ -162,8 +162,8 @@ Miscellaneous capabilities > For remote helpers that implement 'import' or 'export', this capability > allows the refs to be constrained to a private namespace, instead of > writing to refs/heads or refs/remotes directly. > - It is recommended that all importers providing the 'import' or 'export' > - capabilities use this. > + It is recommended that all importers providing the 'import' > + capability use this. It's mandatory for 'export'.
s/It's/It is/
Show 34 quoted lines
> +
> A helper advertising the capability
> `refspec refs/heads/*:refs/svn/origin/branches/*`
> diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
> index cd1873c..3eeb309 100755
> --- a/t/t5801-remote-helpers.sh
> +++ b/t/t5801-remote-helpers.sh
> @@ -111,13 +111,13 @@ test_expect_success 'pulling without refspecs' '
> compare_refs local2 HEAD server HEAD
> '
>
> -test_expect_failure 'pushing without refspecs' '
> +test_expect_success 'pushing without refspecs' '
> test_when_finished "(cd local2 && git reset --hard origin)" &&
> (cd local2 &&
> echo content >>file &&
> git commit -a -m ten &&
> - GIT_REMOTE_TESTGIT_REFSPEC="" git push) &&
> - compare_refs local2 HEAD server HEAD
> + GIT_REMOTE_TESTGIT_REFSPEC="" test_must_fail git push 2> ../error) &&
> + grep "remote-helper doesn.t support push; refspec needed" error
> '
>
> test_expect_success 'pulling without marks' '
> diff --git a/transport-helper.c b/transport-helper.c
> index cea787c..4d98567 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -785,6 +785,9 @@ static int push_refs_with_export(struct transport *transport,
> struct string_list revlist_args = STRING_LIST_INIT_NODUP;
> struct strbuf buf = STRBUF_INIT;
>
> + if (!data->refspecs)
> + die("remote-helper doesn't support push; refspec needed");I think the "refspec needed" text is likely to be confusing if an end-user ever sees this message. I'm not sure how we can provide useful feedback for both remote helper authors and end-users though.
Show 15 quoted lines
> +
> helper = get_helper(transport);
>
> write_constant(helper->in, "export\n");
> @@ -795,8 +798,6 @@ static int push_refs_with_export(struct transport *transport,
> char *private;
> unsigned char sha1[20];
>
> - if (!data->refspecs)
> - continue;
> private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
> if (private && !get_sha1(private, sha1)) {
> strbuf_addf(&buf, "^%s", private);
> --
> 1.8.2.1.679.g509521a