threads / discuss / 15170

strange temporary pull-errors

Subject: strange temporary pull-errors

## tl;dr

3 messages between Aug 22, 2008 and Aug 23, 2008.

replies: 2people: 3as markdown or json

Oliver Kullmann· Aug 22, 2008, 19:13 UTC · lore
Hi,

again and again (first I ignored it) I get the following with version 1.6.0:

> git pull
remote: Counting objects: 55, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 34 (delta 10), reused 24 (delta 3)
Unpacking objects: 100% (34/34), done.
From /h/21/GemeinsameBasis/SAT-Algorithmen/OKplatform/OKsystem/Transitional/
   d69da9e..d9b9324  master     -> origin/master
Updating 688e3cb..d9b9324
error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer
ge.
> git pull

Updating 688e3cb..d9b9324 error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer ge.

> git status

# On branch master # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded. # nothing to commit (working directory clean)

> git pull
Updating 688e3cb..d9b9324
Fast forward
 Buildsystem/Configuration/Html/local_html.mak      |    3 +
 .../Configuration/ReleaseProcess/ReleaseHistory    |    1 +
 Buildsystem/Html/Local/History.html                |   11 +++-
 Buildsystem/Html/Local/PackageHistory.html         |   52 ++++++++++++++++++++
 Buildsystem/Html/Local/plans/History.hpp           |    2 +-
 Buildsystem/Html/Local/plans/milestones.hpp        |    4 +-
 Buildsystem/OKlibBuilding/Targets/html/Makefile    |    1 +
 Buildsystem/ReleaseProcess/README                  |    9 +++-
 Buildsystem/ReleaseProcess/plans/general.hpp       |    5 +-
 Buildsystem/ReleaseProcess/plans/milestones.hpp    |    4 +-
 plans/general.hpp                                  |    7 ++-
 11 files changed, 87 insertions(+), 12 deletions(-)
 create mode 100644 Buildsystem/Html/Local/PackageHistory.html

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.

Oliver
Thomas Rast· Aug 23, 2008, 08:44 UTC · re: Oliver Kullmann · lore

Re: strange temporary pull-errors

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
Miklos Vajna· Aug 23, 2008, 17:35 UTC · re: Oliver Kullmann · lore

Re: strange temporary pull-errors

On Fri, Aug 22, 2008 at 08:13:24PM +0100, Oliver Kullmann <O.Kullmann@swansea.ac.uk> wrote:
Show 30 quoted lines
> > git pull
> Updating 688e3cb..d9b9324
> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer
> ge.
> > git status
> # On branch master
> # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
> #
> nothing to commit (working directory clean)
> > git pull
> Updating 688e3cb..d9b9324
> Fast forward
>  Buildsystem/Configuration/Html/local_html.mak      |    3 +
>  .../Configuration/ReleaseProcess/ReleaseHistory    |    1 +
>  Buildsystem/Html/Local/History.html                |   11 +++-
>  Buildsystem/Html/Local/PackageHistory.html         |   52 ++++++++++++++++++++
>  Buildsystem/Html/Local/plans/History.hpp           |    2 +-
>  Buildsystem/Html/Local/plans/milestones.hpp        |    4 +-
>  Buildsystem/OKlibBuilding/Targets/html/Makefile    |    1 +
>  Buildsystem/ReleaseProcess/README                  |    9 +++-
>  Buildsystem/ReleaseProcess/plans/general.hpp       |    5 +-
>  Buildsystem/ReleaseProcess/plans/milestones.hpp    |    4 +-
>  plans/general.hpp                                  |    7 ++-
>  11 files changed, 87 insertions(+), 12 deletions(-)
>  create mode 100644 Buildsystem/Html/Local/PackageHistory.html
> 
> 
> 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.
Yes, it is. It runs git update-index --refresh.

I think Junio fixed this two days ago in 9ca8f60 ("git-merge": allow fast-forwarding in a stat-dirty tree). Could you please confirm?

Thanks.

← back to recent threads