From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Andreas G. Schacker" <andreas.schacker@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] doc/read-tree: remove obsolete remark
Date: Thu, 11 Jan 2018 15:14:07 -0800 [thread overview]
Message-ID: <xmqqd12gxa2o.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180111222155.GA13570@sigill.intra.peff.net> (Jeff King's message of "Thu, 11 Jan 2018 17:21:55 -0500")
Jeff King <peff@peff.net> writes:
> On Thu, Jan 11, 2018 at 11:02:04AM -0800, Junio C Hamano wrote:
>
>> >> ---prefix=<prefix>/::
>> >> +--prefix=<prefix>::
>> >> Keep the current index contents, and read the contents
>> >> of the named tree-ish under the directory at `<prefix>`.
>> >> The command will refuse to overwrite entries that already
>> >> - existed in the original index file. Note that the `<prefix>/`
>> >> - value must end with a slash.
>> >> + existed in the original index file.
>> >
>> > Is it worth mentioning in the new world order that the slash is not
>> > implied? I.e., that you probably do want to say "--prefix=foo/" if you
>> > want the subdirectory "foo", but do not want to match "foobar"?
>>
>> Doesn't "git read-tree --prefix=previous HEAD^" add paths like
>> "previous/Documentation/Makefile" to the index, i.e. instead of
>> forcing you to have the required slash at the end, we give one for
>> free when it is missing?
>
> Yes, I think it does what you'd want with that path. But it would not do
> what you want by adding "previous-file". Which seems like a gotcha that
> should be mentioned.
I am a bit puzzled.
Do you mean a user who types "git read-tree --prefix=v1- HEAD^" may
be expecting to see that the blob object "HEAD^:Makefile" added at
path "v1-Makefile" etc?
next prev parent reply other threads:[~2018-01-11 23:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 15:30 [PATCH] doc/read-tree: remove obsolete remark Andreas G. Schacker
2018-01-09 19:36 ` Junio C Hamano
2018-01-11 10:49 ` Jeff King
2018-01-11 19:02 ` Junio C Hamano
2018-01-11 22:21 ` Jeff King
2018-01-11 23:14 ` Junio C Hamano [this message]
2018-01-12 0:35 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd12gxa2o.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=andreas.schacker@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).