git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
JMJody McIntyre <scjody@sun.com>
Date
Jul 29, 2009, 20:36 UTC
Message-ID
<20090729203637.GF22281@clouds>
In-Reply-To
<32541b130907281719y57862c25w524f5bbf1df11c40@mail.gmail.com>
On Tue, Jul 28, 2009 at 08:19:54PM -0400, Avery Pennarun wrote:
Show 5 quoted lines
> 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.

Interesting. Now that I think about it, I do rsync this tree between my desktop and laptop. This would explain why I only just started seeing this problem - I probably originally pulled the tree to my desktop, but this week I'm working on my laptop.

> 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 $ head /tmp/git_status.txt # On branch master # Your branch is behind 'origin/master' by 484 commits, and can be fast-forwarded. # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: .gitignore # modified: .mailmap # modified: COPYING

There appears to be an entry for every file in my tree minus things that are in .gitignore. git_status.txt is available at:

http://www.modernduck.com/files/git_status.txt
> I believe this cache out-of-dateness issue was fixed in a recent version of git.
I'll try that in the next few days and report back.

Thanks, Jody

> 
> Have fun,
> 
> Avery
Previous: Avery PennarunNext: Avery Pennarun
Message 3 of 6 in “'git pull' fails with 'not uptodate' message despite 'git reset --hard'”
  1. Jody McIntyreJul 28, 2009
  2. Avery PennarunJul 29, 2009
  3. Jody McIntyreJul 29, 2009
  4. Avery PennarunJul 29, 2009
  5. Jody McIntyreJul 29, 2009
  6. Jody McIntyreJul 30, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.