Re: 'git pull' fails with 'not uptodate' message despite 'git reset --hard'

[Avery Pennarun <apenwarr@gmail.com>]

On Wed, Jul 29, 2009 at 8:36 PM, Jody McIntyre<scjody@sun.com> wrote:
> On Tue, Jul 28, 2009 at 08:19:54PM -0400, Avery Pennarun wrote:
>> Usually a 'git status' will fix it.  In any case, if it doesn't,
>> please send the output of 'git status' :)
>
> This is again a bit strange:
>
> $ git status
> # On branch master
> # Your branch is behind 'origin/master' by 484 commits, and can be fast-forwarded.
> #
> nothing to commit (working directory clean)
> $ git status CREDITS > /tmp/git_status.txt
> $ wc -l /tmp/git_status.txt
> 26063 /tmp/git_status.txt

Okay, that's extra strange: when I've had this problem, 'git status'
has fixed it right away; it just goes away after that.  It might be
that recent changes to git have added an "optimization" that makes
this not happen for some reason.

You can always try the thermonuclear option:

   mv .git/index .git/index.bak
   git reset HEAD    # note, don't use --hard here
   git status   # should show only files you have *really* changed

Of course, if this fixes it than it's *definitely* a bug somewhere.

Good luck.

Avery