Re: strange temporary pull-errors

On Fri, Aug 22, 2008 at 08:13:24PM +0100, Oliver Kullmann [off-list ref] wrote:

quoted

git pull

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

quoted

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)

quoted

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.