[RFH] git reset --hard broken???

2013-07-01 Thread Junio C Hamano
I have no time to dig this down, but I just noticed this by accident: $ make $ cd t $ sh ./t7011-skip-worktree-reading.sh -d $ cd trash*.t7011* $ git reset --hard HEAD error: Entry '1' not uptodate. Cannot merge. fatal: Could not reset index

Re: [RFH] git reset --hard broken???

2013-07-01 Thread Jeff King
On Mon, Jul 01, 2013 at 02:28:52PM -0700, Junio C Hamano wrote: I have no time to dig this down, but I just noticed this by accident: $ make $ cd t $ sh ./t7011-skip-worktree-reading.sh -d $ cd trash*.t7011* $ git reset --hard HEAD error: