From: Junio C Hamano <gitster@pobox.com>
To: Peter Eckersley <peter.eckersley@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Weirdness with git change detection
Date: Tue, 11 Jul 2017 09:04:02 -0700 [thread overview]
Message-ID: <xmqqpod72c5p.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqy3rv2cfv.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 11 Jul 2017 08:57:56 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> 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.
prev parent reply other threads:[~2017-07-11 16:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 23:45 Weirdness with git change detection Peter Eckersley
2017-07-11 4:15 ` Torsten Bögershausen
2017-07-11 7:06 ` Jeff King
2017-07-11 7:31 ` Peter Eckersley
2017-07-11 7:34 ` Jeff King
2017-07-11 8:20 ` Torsten Bögershausen
2017-07-11 8:24 ` Jeff King
2017-08-18 6:56 ` Michael J Gruber
2017-08-18 11:57 ` Jeff King
2017-07-11 15:57 ` Junio C Hamano
2017-07-11 16:04 ` Junio C Hamano [this message]
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=xmqqpod72c5p.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peter.eckersley@gmail.com \
/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