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

Re: Weirdness with git change detection

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 11, 2017, 16:04 UTC
Message-ID
<xmqqpod72c5p.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<xmqqy3rv2cfv.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 15 quoted lines
> Peter Eckersley <peter.eckersley@gmail.com> writes:
>
>> I have a local git repo that's in some weird state where changes
>> appear to be detected by "git diff" and prevent operations like "git
>> checkout" from switching branches, but those changes are not removed
>> by a "git reset --hard" or "git stash".
>>
>> Here's an example of the behaviour, with "git reset --hard" failing to
>> clear a diff in the index:
>>
>> https://paste.debian.net/975811/
>>
>> Happy to collect additional debugging information if it's useful.
>
> Do you have any funny clean-smudge pair that do not round-trip?

Ah, nevermind. Peff's analysis looks correct. Thanks for a report to provoke a good discussion.

Previous: Junio C Hamano
Message 11 of 11 in “Weirdness with git change detection”
  1. Peter EckersleyJul 10, 2017
  2. Torsten BögershausenJul 11, 2017
  3. Jeff KingJul 11, 2017
  4. Peter EckersleyJul 11, 2017
  5. Jeff KingJul 11, 2017
  6. Torsten BögershausenJul 11, 2017
  7. Jeff KingJul 11, 2017
  8. Michael J GruberAug 18, 2017
  9. Jeff KingAug 18, 2017
  10. Junio C HamanoJul 11, 2017
  11. Junio C HamanoJul 11, 2017

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.