From: Junio C Hamano <gitster@pobox.com>
To: Andreas Heiduk <asheiduk@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Torsten Bögershausen" <tboegi@web.de>
Subject: Re: [PATCH] doc: fix location of index in worktree scenatio
Date: Sat, 10 Jun 2017 20:17:44 +0900 [thread overview]
Message-ID: <xmqqmv9g1487.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170610090719.8429-1-asheiduk@gmail.com> (Andreas Heiduk's message of "Sat, 10 Jun 2017 11:07:19 +0200")
Andreas Heiduk <asheiduk@gmail.com> writes:
> When setting `.gitattributes` in a second worktree, a plain `rm .git/index`
> does not actually delete the index.
>
> Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
> ---
> Documentation/gitattributes.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Right.
I however have to wonder if we can do the same without futzing
directly with the "index" file as a filesystem entity. With or
without your update, what is taught in the document feels like
munging a disk block with binary editor to correct a corrupted
filesystem X-<.
For example, can we do this "empty the index" step with things like
$ git rm --cached .
or
$ git read-tree --empty
instead?
Thanks.
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index 473648386..4c6b74fa6 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -229,7 +229,7 @@ From a clean working directory:
>
> -------------------------------------------------
> $ echo "* text=auto" >.gitattributes
> -$ rm .git/index # Remove the index to re-scan the working directory
> +$ rm "$(git rev-parse --git-path index)" # Remove the index to re-scan the working directory
> $ git add .
> $ git status # Show files that will be normalized
> $ git commit -m "Introduce end-of-line normalization"
next prev parent reply other threads:[~2017-06-10 11:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-10 9:07 [PATCH] doc: fix location of index in worktree scenatio Andreas Heiduk
2017-06-10 11:17 ` Junio C Hamano [this message]
2017-06-10 17:24 ` Andreas Heiduk
2017-06-10 17:38 ` [PATCH v2] " Andreas Heiduk
2017-06-12 10:03 ` Torsten Bögershausen
2017-06-12 10:48 ` Andreas Heiduk
2017-06-12 16:06 ` Junio C Hamano
2017-06-13 4:29 ` Torsten Bögershausen
2017-06-13 13:07 ` Junio C Hamano
2017-06-13 22:15 ` [PATCH v3] doc: do not use `rm .git/index` when normalizing line endings Andreas Heiduk
2017-06-14 4:06 ` Torsten Bögershausen
2017-06-14 6:51 ` [PATCH v4] " Andreas Heiduk
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=xmqqmv9g1487.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=asheiduk@gmail.com \
--cc=git@vger.kernel.org \
--cc=tboegi@web.de \
/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).