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

Re: strange temporary pull-errors

From
Thomas Rast <trast@student.ethz.ch>
Date
Aug 23, 2008, 08:44 UTC
Message-ID
<200808231044.50797.trast@student.ethz.ch>
In-Reply-To
<20080822191324.GO10819@cs-wsok.swansea.ac.uk>
Oliver Kullmann wrote:
> 
> > git pull
[...]
> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.
[...]
> > git status
[...]
> nothing to commit (working directory clean)
> > git pull
[succeeds]
> There is nothing special going out, the simple pull should succeed, but
> I have to try several times; don't know whether the "git status" is
> instrumental here or not --- will try the next time.

Saying 'git status' refreshes the index. If you have touched (updated mtime) local_html.mak without making any changes, 'git merge' just compared the mtime and considered the file changed. But 'git status' actually compares the contents and finds it has not been changed. I don't know whether 1.6 (most likely builtin-merge) changed behaviour in this respect, maybe you could try with an older version too.

There are other cases where you need a refresh, for example if you have made a copy of a git-tracked directory with 'cp -r'.

- Thomas
-- 
Thomas Rast
trast@student.ethz.ch
Previous: Oliver KullmannNext: Miklos Vajna
Message 2 of 3 in “strange temporary pull-errors”
  1. Oliver KullmannAug 22, 2008
  2. Thomas RastAug 23, 2008
  3. Miklos VajnaAug 23, 2008

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.