From: Robert Dailey <rcdailey.lists@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>, Git <git@vger.kernel.org>
Subject: Re: Line ending normalization doesn't work as expected
Date: Thu, 15 Feb 2018 09:24:40 -0600 [thread overview]
Message-ID: <CAHd499CSe6d1SBaDYNRD9HXaWRJ9QYzmOCaBWFrV52UNRMVqhA@mail.gmail.com> (raw)
In-Reply-To: <xmqq8tgrhdt0.fsf@gitster.mtv.corp.google.com>
On Tue, Oct 3, 2017 at 9:00 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Torsten Bögershausen <tboegi@web.de> writes:
>
>>> $ git rm -r --cached . && git add .
>>
>> (Both should work)
>>
>> To be honest, from the documentation, I can't figure out the difference between
>> $ git read-tree --empty
>> and
>> $ git rm -r --cached .
>>
>> Does anybody remember the discussion, why we ended up with read-tree ?
>
> We used to use neither, and considered it fine to "rm .git/index" if
> you wanted to empty the on-disk index file in the old world. In the
> modern world, folks want you to avoid touching filesystem directly
> and instead want you to use Git tools, and the above are two obvious
> ways to do so.
>
> "git read-tree" (without any parameter, i.e. "read these 0 trees and
> populate the index with it") and its modern and preferred synonym
> "git read-tree --empty" (i.e. "I am giving 0 trees and I know the
> sole effect of this command is to empty the index.") are more direct
> ways to express "I want the index emptied" between the two.
>
> The other one, "git rm -r --cached .", in the end gives you the same
> state because it tells Git to "iterate over all the entries in the
> index, find the ones that match pathspec '.', and remove them from
> the index.". It is not wrong per-se, but conceptually it is a bit
> roundabout way to say that "I want the index emptied", I would
> think.
>
> I wouldn't be surprised if the "rm -r --cached ." were a lot slower,
> due to the overhead of having to do the pathspec filtering that ends
> up to be a no-op, but there shouldn't be a difference in the end
> result.
Sorry to bring this old thread back to life, but I did notice that
this causes file modes to reset back to 644 (from 755) on Windows
version of Git. Is there a way to `$ git read-tree --empty && git add
.` without mucking with file permissions?
next prev parent reply other threads:[~2018-02-15 18:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 15:00 Line ending normalization doesn't work as expected Robert Dailey
2017-10-03 16:26 ` Torsten Bögershausen
2017-10-03 17:23 ` Robert Dailey
2017-10-03 19:19 ` Torsten Bögershausen
2017-10-04 2:00 ` Junio C Hamano
2017-10-04 16:26 ` Robert Dailey
2017-10-04 16:59 ` Jonathan Nieder
2017-10-04 18:03 ` Robert Dailey
2017-10-05 1:31 ` Junio C Hamano
2017-10-05 1:46 ` Jonathan Nieder
2017-10-04 21:17 ` Torsten Bögershausen
2017-10-05 1:38 ` Junio C Hamano
2017-10-05 3:31 ` Junio C Hamano
2017-10-05 21:42 ` Torsten Bögershausen
2017-10-06 0:33 ` Junio C Hamano
2017-10-06 17:58 ` Torsten Bögershausen
2017-10-16 16:49 ` [PATCH v1 1/1] Introduce git add --renormalize tboegi
2017-10-16 17:34 ` Junio C Hamano
2017-10-30 16:29 ` [PATCH v2 " tboegi
2017-11-07 5:50 ` Junio C Hamano
2017-11-07 17:26 ` Torsten Bögershausen
2017-11-08 0:37 ` Junio C Hamano
2017-11-09 18:47 ` Torsten Bögershausen
2017-11-10 0:22 ` Junio C Hamano
2017-11-12 20:08 ` Torsten Bögershausen
2017-11-16 16:38 ` [PATCH v3 " tboegi
2017-11-17 1:24 ` Junio C Hamano
2017-11-17 20:44 ` Eric Sunshine
2017-11-18 1:47 ` Junio C Hamano
2018-02-15 15:24 ` Robert Dailey [this message]
2018-02-15 19:16 ` Line ending normalization doesn't work as expected Junio C Hamano
2018-02-15 21:47 ` Robert Dailey
2018-02-16 16:34 ` Torsten Bögershausen
2018-02-16 17:19 ` Robert Dailey
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=CAHd499CSe6d1SBaDYNRD9HXaWRJ9QYzmOCaBWFrV52UNRMVqhA@mail.gmail.com \
--to=rcdailey.lists@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).