From: John Keeping <john@keeping.me.uk>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Sverre Rabbelier <srabbelier@gmail.com>, Max Horn <max@quendi.de>,
Jonathan Nieder <jrnieder@gmail.com>,
Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
Subject: Re: [PATCH v2 1/6] transport-helper: clarify *:* refspec
Date: Thu, 18 Apr 2013 09:24:41 +0100 [thread overview]
Message-ID: <20130418082441.GR2278@serenity.lan> (raw)
In-Reply-To: <1366258473-12841-2-git-send-email-felipe.contreras@gmail.com>
On Wed, Apr 17, 2013 at 11:14:28PM -0500, Felipe Contreras wrote:
> The *:* refspec doesn't work, and never has, clarify the code and
> documentation to reflect that. This in effect reverts commit 9e7673e
> (gitremote-helpers(1): clarify refspec behaviour).
In what way doesn't it work? If I specify that refspec then I do get
output that appears sensible.
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> Documentation/gitremote-helpers.txt | 4 ++--
> t/t5801-remote-helpers.sh | 15 ---------------
> transport-helper.c | 2 +-
> 3 files changed, 3 insertions(+), 18 deletions(-)
>
> diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
> index f506031..0c91aba 100644
> --- a/Documentation/gitremote-helpers.txt
> +++ b/Documentation/gitremote-helpers.txt
> @@ -174,8 +174,8 @@ ref.
> This capability can be advertised multiple times. The first
> applicable refspec takes precedence. The left-hand of refspecs
> advertised with this capability must cover all refs reported by
> -the list command. If a helper does not need a specific 'refspec'
> -capability then it should advertise `refspec *:*`.
> +the list command. If no 'refspec' capability is advertised,
> +there is an implied `refspec *:*`.
This is wrong. As your later patch makes clearer, there is no implied
refspec for push - it only works for fetch. I found the wording you've
reverted to extremely misleading. How about something like this:
For historical reasons, 'import' treats the absence of a 'refspec'
line as equivalent to `refspec *:*`; remote helpers should always
specify an explicit refspec.
?
> 'bidi-import'::
> This modifies the 'import' capability.
> diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
> index f387027..cd1873c 100755
> --- a/t/t5801-remote-helpers.sh
> +++ b/t/t5801-remote-helpers.sh
> @@ -120,21 +120,6 @@ test_expect_failure 'pushing without refspecs' '
> compare_refs local2 HEAD server HEAD
> '
>
> -test_expect_success 'pulling with straight refspec' '
> - (cd local2 &&
> - GIT_REMOTE_TESTGIT_REFSPEC="*:*" git pull) &&
> - compare_refs local2 HEAD server HEAD
> -'
> -
> -test_expect_failure 'pushing with straight refspec' '
> - test_when_finished "(cd local2 && git reset --hard origin)" &&
> - (cd local2 &&
> - echo content >>file &&
> - git commit -a -m eleven &&
> - GIT_REMOTE_TESTGIT_REFSPEC="*:*" git push) &&
> - compare_refs local2 HEAD server HEAD
> -'
> -
> test_expect_success 'pulling without marks' '
> (cd local2 &&
> GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
> diff --git a/transport-helper.c b/transport-helper.c
> index dcd8d97..cea787c 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -469,7 +469,7 @@ static int fetch_with_import(struct transport *transport,
> * were fetching.
> *
> * (If no "refspec" capability was specified, for historical
> - * reasons we default to *:*.)
> + * reasons we default to the equivalent of *:*.)
> *
> * Store the result in to_fetch[i].old_sha1. Callers such
> * as "git fetch" can use the value to write feedback to the
> --
> 1.8.2.1.679.g509521a
next prev parent reply other threads:[~2013-04-18 8:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-18 4:14 [PATCH v2 0/6] transport-helper: some clarifications and a fix Felipe Contreras
2013-04-18 4:14 ` [PATCH v2 1/6] transport-helper: clarify *:* refspec Felipe Contreras
2013-04-18 8:24 ` John Keeping [this message]
2013-04-18 9:27 ` Felipe Contreras
2013-04-18 9:45 ` John Keeping
2013-04-18 10:02 ` Felipe Contreras
2013-04-18 10:06 ` John Keeping
2013-04-18 17:27 ` Junio C Hamano
2013-04-18 19:07 ` Felipe Contreras
2013-04-18 4:14 ` [PATCH v2 2/6] transport-helper: update refspec documentation Felipe Contreras
2013-04-18 4:14 ` [PATCH v2 3/6] transport-helper: clarify pushing without refspecs Felipe Contreras
2013-04-18 10:11 ` John Keeping
2013-04-18 10:14 ` Felipe Contreras
2013-04-18 10:24 ` John Keeping
2013-04-18 17:29 ` Junio C Hamano
2013-04-18 18:35 ` John Keeping
2013-04-18 17:28 ` Junio C Hamano
2013-04-19 0:27 ` Eric Sunshine
2013-04-19 0:30 ` Felipe Contreras
2013-04-19 3:41 ` Junio C Hamano
2013-04-18 4:14 ` [PATCH v2 4/6] transport-helper: warn when refspec is not used Felipe Contreras
2013-04-18 17:30 ` Junio C Hamano
2013-04-18 19:12 ` Felipe Contreras
2013-04-18 4:14 ` [PATCH v2 5/6] transport-helper: trivial code shuffle Felipe Contreras
2013-04-18 4:14 ` [PATCH v2 6/6] transport-helper: update remote helper namespace Felipe Contreras
2013-04-18 17:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130418082441.GR2278@serenity.lan \
--to=john@keeping.me.uk \
--cc=felipe.contreras@gmail.com \
--cc=florian.achleitner.2.6.31@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=max@quendi.de \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).