git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Random failure after "git config core.autocrlf false" then "git reset --hard"

From
Charles Bailey <charles@hashpling.org>
Date
May 14, 2009, 07:49 UTC
Message-ID
<20090514074925.GB8713@hashpling.org>
In-Reply-To
<4A0A34E3.9050801@SierraAtlantic.com>
On Tue, May 12, 2009 at 10:48:03PM -0400, Don Slutz wrote:
Show 7 quoted lines
> 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/
Previous: Don SlutzNext: Don Slutz
Message 2 of 3 in “Random failure after "git config core.autocrlf false" then "git reset --hard"”
  1. Don SlutzMay 13, 2009
  2. Charles BaileyMay 14, 2009
  3. Don SlutzMay 14, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.