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

From: Avery Pennarun <apenwarr@gmail.com>
Date: Jul 29, 2009, 00:19 UTC
Message-ID: <32541b130907281719y57862c25w524f5bbf1df11c40@mail.gmail.com>
In-Reply-To: <20090728230842.GE22281@clouds>

On Tue, Jul 28, 2009 at 7:08 PM, Jody McIntyre<scjody@sun.com> wrote:

Show 9 quoted lines

> I am attempting to update my kernel tree but getting a 'not uptodate' error:
>
> $ git fetch origin
> [...]
> $ 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.

[...]

> I use quilt with this tree but no quilt patches are currently applied and it
> should be clean.  It hasn't even been built (I rsync to another machine for
> that.)

I've run into this problem when I rsync a tree from one system to another. The inodes will be different, so merge will think files in the work tree have changed, but then diff (of course) won't see anything because it looks at the actual file contents, which are identical.

Usually a 'git status' will fix it. In any case, if it doesn't, please send the output of 'git status' :)

I believe this cache out-of-dateness issue was fixed in a recent version of git.

Have fun,

Avery