From: Charles Bailey <charles@hashpling.org>
To: Don Slutz <Don.Slutz@SierraAtlantic.com>
Cc: git@vger.kernel.org
Subject: Re: Random failure after "git config core.autocrlf false" then "git reset --hard"
Date: Thu, 14 May 2009 08:49:25 +0100 [thread overview]
Message-ID: <20090514074925.GB8713@hashpling.org> (raw)
In-Reply-To: <4A0A34E3.9050801@SierraAtlantic.com>
On Tue, May 12, 2009 at 10:48:03PM -0400, Don Slutz wrote:
> This both works and fails with either file2 & subdir/file3 "modified" or
> just subdir/file3. I have found that "git reset --hard" looks to be the
> issue. If you have autocrlf=true, and a clean work tree and then set
> autocrlf=false; then
> "git reset --hard" does not change the work tree files. However
> sometimes (which so far I have only been able to reproduce with this
> test) git diff will report the difference.
It shouldn't be random. git reset --hard should only reset those
working tree files for which the appropriate index entry has been
change or which have been change on disk since checkout from the
index. Changing the core.autocrlf setting doesn't count as in index
change (although perhaps it should??).
The point of git reset --hard in these tests was to throw away any
uncommitted merge resolutions and/or conflicts, not about rechecking
out everything. Admittedly the tests are probably a bit fast and loose
and they should probably force a complete refresh from the index when
the core.autocrlf setting is changed.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2009-05-14 7:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-13 2:48 Random failure after "git config core.autocrlf false" then "git reset --hard" Don Slutz
2009-05-14 7:49 ` Charles Bailey [this message]
2009-05-14 14:53 ` Don Slutz
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=20090514074925.GB8713@hashpling.org \
--to=charles@hashpling.org \
--cc=Don.Slutz@SierraAtlantic.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 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).