From: Anthony Baire <anthony.baire@irisa.fr>
To: Thomas Rast <tr@thomasrast.ch>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] subtree: fix argument validation in add/pull/push
Date: Wed, 27 Nov 2013 21:30:51 +0100 [thread overview]
Message-ID: <5296567B.5080704@irisa.fr> (raw)
In-Reply-To: <87siuhfy9q.fsf@thomasrast.ch>
On 27/11/2013 20:19, Thomas Rast wrote:
> Anthony Baire <Anthony.Baire@irisa.fr> writes:
>
>> When working with a remote repository add/pull/push do not accept a
>> <refspec> as parameter but just a <ref>. They should accept any
>> well-formatted ref name.
> [...]
>> - update the doc to use <ref> instead of <refspec>
> [...]
>> OPTS_SPEC="\
>> git subtree add --prefix=<prefix> <commit>
>> -git subtree add --prefix=<prefix> <repository> <commit>
>> +git subtree add --prefix=<prefix> <repository> <ref>
>> git subtree merge --prefix=<prefix> <commit>
>> -git subtree pull --prefix=<prefix> <repository> <refspec...>
>> -git subtree push --prefix=<prefix> <repository> <refspec...>
>> +git subtree pull --prefix=<prefix> <repository> <ref>
>> +git subtree push --prefix=<prefix> <repository> <ref>
>> git subtree split --prefix=<prefix> <commit...>
> [...]
>> @@ -68,7 +68,7 @@ COMMANDS
>> --------
>> add::
>> Create the <prefix> subtree by importing its contents
>> - from the given <refspec> or <repository> and remote <refspec>.
>> + from the given <commit> or <repository> and remote <ref>.
> AFAICS you are changing refspec->commit in the manpage, but commit->ref
> in the usage message for 'subtree add'? How does this line up?
>
'git subtree add' accepts a commit when working with the local
repository and a ref when working with a remote repository:
git subtree add --prefix=<prefix> <commit>
git subtree add --prefix=<prefix> <repository> <ref>
but the manpage was no in sync with the code. I fixed it for the local
case too.
Anthony
prev parent reply other threads:[~2013-11-27 20:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 18:34 [PATCH] subtree: fix argument validation in add/pull/push Anthony Baire
2013-11-27 19:19 ` Thomas Rast
2013-11-27 20:30 ` Anthony Baire [this message]
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=5296567B.5080704@irisa.fr \
--to=anthony.baire@irisa.fr \
--cc=git@vger.kernel.org \
--cc=tr@thomasrast.ch \
/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).