From: Jody McIntyre <scjody@sun.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: 'git pull' fails with 'not uptodate' message despite 'git reset --hard'
Date: Wed, 29 Jul 2009 18:54:32 -0400 [thread overview]
Message-ID: <20090729225432.GG22281@clouds> (raw)
In-Reply-To: <32541b130907291344u3c2b7df8ld848a79ec38197a6@mail.gmail.com>
On Wed, Jul 29, 2009 at 08:44:32PM +0000, Avery Pennarun wrote:
> 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.
That still doesn't fix the problem. I guess the index is not to blame.
$ mv .git/index .git/index.bak
$ git reset HEAD
$ 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 pull origin tags/v2.6.31-rc4
From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
* tag v2.6.31-rc4 -> FETCH_HEAD
Updating 6847e15..4be3bd7
error: Entry 'CREDITS' not uptodate. Cannot merge.
Incidentally:
$ diff .git/index.bak .git/index
Binary files .git/index.bak and .git/index differ
I don't know what .git/index contains so I don't know if that's surprising or
not.
Cheers,
Jody
>
> Good luck.
>
> Avery
next prev parent reply other threads:[~2009-07-29 22:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-28 23:08 'git pull' fails with 'not uptodate' message despite 'git reset --hard' Jody McIntyre
2009-07-29 0:19 ` Avery Pennarun
2009-07-29 20:36 ` Jody McIntyre
2009-07-29 20:44 ` Avery Pennarun
2009-07-29 22:54 ` Jody McIntyre [this message]
2009-07-30 15:40 ` Jody McIntyre
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=20090729225432.GG22281@clouds \
--to=scjody@sun.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.