From: Junio C Hamano <gitster@pobox.com>
To: "Andreas G. Schacker" <andreas.schacker@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc/read-tree: remove obsolete remark
Date: Tue, 09 Jan 2018 11:36:53 -0800 [thread overview]
Message-ID: <xmqq373e6cyy.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180109153034.22970-1-andreas.schacker@gmail.com> (Andreas G. Schacker's message of "Tue, 9 Jan 2018 16:30:34 +0100")
"Andreas G. Schacker" <andreas.schacker@gmail.com> writes:
> Earlier versions of `git read-tree` required the `--prefix` option value
> to end with a slash. This restriction was eventually lifted without a
> corresponding amendment to the documentation.
>
> Signed-off-by: Andreas G. Schacker <andreas.schacker@gmail.com>
> ---
Thanks. "read-tree --prefix=foo- $tree" is allowed these days,
indeed. Will queue.
What is curious is that 34110cd4 ("Make 'unpack_trees()' have a
separate source and destination index", 2008-03-06) seems to be the
one that removed the check, and the removed contents do not seem to
have much in common with the stated goal of the commit.
> Documentation/git-read-tree.txt | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
> index 72bd809fb..f2a07d54d 100644
> --- a/Documentation/git-read-tree.txt
> +++ b/Documentation/git-read-tree.txt
> @@ -81,12 +81,11 @@ OPTIONS
> * when both sides add a path identically. The resolution
> is to add that path.
>
> ---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.
>
> --exclude-per-directory=<gitignore>::
> When running the command with `-u` and `-m` options, the
next prev parent reply other threads:[~2018-01-09 19:36 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq373e6cyy.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=andreas.schacker@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.