Re: Weirdness with git change detection

2017-08-18 Thread Jeff King
On Fri, Aug 18, 2017 at 08:56:03AM +0200, Michael J Gruber wrote: > > The idea being that users could run "git lint" if they suspect something > > funny is going on. I dunno. It may be a dead-end. Most such > > oddities are better detected and handled during actual git operations if > > we can. So

Re: Weirdness with git change detection

2017-08-17 Thread Michael J Gruber
Jeff King venit, vidit, dixit 11.07.2017 10:24: > On Tue, Jul 11, 2017 at 10:20:43AM +0200, Torsten Bögershausen wrote: > >>> No problem. I actually think it would be interesting if Git could >>> somehow detect and warn about this situation. But the obvious way to do >>> that would be to re-run th

Re: Weirdness with git change detection

2017-07-11 Thread Junio C Hamano
Junio C Hamano writes: > Peter Eckersley 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 "gi

Re: Weirdness with git change detection

2017-07-11 Thread Junio C Hamano
Peter Eckersley 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

Re: Weirdness with git change detection

2017-07-11 Thread Jeff King
On Tue, Jul 11, 2017 at 10:20:43AM +0200, Torsten Bögershausen wrote: > > No problem. I actually think it would be interesting if Git could > > somehow detect and warn about this situation. But the obvious way to do > > that would be to re-run the clean filter directly after checkout. And > > doin

Re: Weirdness with git change detection

2017-07-11 Thread Torsten Bögershausen
On 11/07/17 09:34, Jeff King wrote: On Tue, Jul 11, 2017 at 12:31:25AM -0700, Peter Eckersley wrote: I did try to test that hypothesis by editing the filter to be a no-op, but it's possible I go that wrong. My apologies for bugging the list! Actually I like this kind of feedback, to see how

Re: Weirdness with git change detection

2017-07-11 Thread Jeff King
On Tue, Jul 11, 2017 at 12:31:25AM -0700, Peter Eckersley wrote: > I did try to test that hypothesis by editing the filter to be a no-op, > but it's possible I go that wrong. My apologies for bugging the list! No problem. I actually think it would be interesting if Git could somehow detect and wa

Re: Weirdness with git change detection

2017-07-11 Thread Peter Eckersley
I did try to test that hypothesis by editing the filter to be a no-op, but it's possible I go that wrong. My apologies for bugging the list! On 11 July 2017 at 00:06, Jeff King wrote: > On Tue, Jul 11, 2017 at 06:15:17AM +0200, Torsten Bögershausen wrote: > >> On 11/07/17 01:45, Peter Eckersley w

Re: Weirdness with git change detection

2017-07-11 Thread Jeff King
On Tue, Jul 11, 2017 at 06:15:17AM +0200, Torsten Bögershausen wrote: > On 11/07/17 01:45, Peter Eckersley wrote: > > 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

Re: Weirdness with git change detection

2017-07-10 Thread Torsten Bögershausen
On 11/07/17 01:45, Peter Eckersley wrote: 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

Weirdness with git change detection

2017-07-10 Thread Peter Eckersley
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 --h