{"thread":{"id":"15170","subject":"strange temporary pull-errors","startedAt":"2008-08-22T19:13:24Z","lastAt":"2008-08-23T17:35:48Z","messageCount":3,"participants":["Oliver Kullmann","Thomas Rast","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"88176","messageId":"20080822191324.GO10819@cs-wsok.swansea.ac.uk","threadId":"15170","inReplyTo":null,"subject":"strange temporary pull-errors","fromName":"Oliver Kullmann","fromEmail":"o.kullmann@swansea.ac.uk","sentAt":"2008-08-22T19:13:24Z","receivedAt":"2008-08-22T19:13:24Z","isPatch":false,"sender":{"key":"o.kullmann@swansea.ac.uk","avatar":null},"body":"Hi,\n\nagain and again (first I ignored it) I get the\nfollowing with version 1.6.0:\n\n> git pull\nremote: Counting objects: 55, done.\nremote: Compressing objects: 100% (31/31), done.\nremote: Total 34 (delta 10), reused 24 (delta 3)\nUnpacking objects: 100% (34/34), done.\nFrom /h/21/GemeinsameBasis/SAT-Algorithmen/OKplatform/OKsystem/Transitional/\n d69da9e..d9b9324 master -> origin/master\nUpdating 688e3cb..d9b9324\nerror: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer\nge.\n> git pull\nUpdating 688e3cb..d9b9324\nerror: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer\nge.\n> git status\n# On branch master\n# Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.\n#\nnothing to commit (working directory clean)\n> git pull\nUpdating 688e3cb..d9b9324\nFast forward\n Buildsystem/Configuration/Html/local_html.mak | 3 +\n .../Configuration/ReleaseProcess/ReleaseHistory | 1 +\n Buildsystem/Html/Local/History.html | 11 +++-\n Buildsystem/Html/Local/PackageHistory.html | 52 ++++++++++++++++++++\n Buildsystem/Html/Local/plans/History.hpp | 2 +-\n Buildsystem/Html/Local/plans/milestones.hpp | 4 +-\n Buildsystem/OKlibBuilding/Targets/html/Makefile | 1 +\n Buildsystem/ReleaseProcess/README | 9 +++-\n Buildsystem/ReleaseProcess/plans/general.hpp | 5 +-\n Buildsystem/ReleaseProcess/plans/milestones.hpp | 4 +-\n plans/general.hpp | 7 ++-\n 11 files changed, 87 insertions(+), 12 deletions(-)\n create mode 100644 Buildsystem/Html/Local/PackageHistory.html\n\n\nThere is nothing special going out, the simple pull should succeed, but\nI have to try several times; don't know whether the \"git status\" is\ninstrumental here or not --- will try the next time.\n\nOliver\n"},{"id":"88274","messageId":"200808231044.50797.trast@student.ethz.ch","threadId":"15170","inReplyTo":"20080822191324.GO10819@cs-wsok.swansea.ac.uk","subject":"Re: strange temporary pull-errors","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2008-08-23T08:44:45Z","receivedAt":"2008-08-23T08:44:45Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Oliver Kullmann wrote:\n> \n> > git pull\n[...]\n> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.\n[...]\n> > git status\n[...]\n> nothing to commit (working directory clean)\n> > git pull\n[succeeds]\n> There is nothing special going out, the simple pull should succeed, but\n> I have to try several times; don't know whether the \"git status\" is\n> instrumental here or not --- will try the next time.\n\nSaying 'git status' refreshes the index. If you have touched (updated\nmtime) local_html.mak without making any changes, 'git merge' just\ncompared the mtime and considered the file changed. But 'git status'\nactually compares the contents and finds it has not been changed. I\ndon't know whether 1.6 (most likely builtin-merge) changed behaviour\nin this respect, maybe you could try with an older version too.\n\nThere are other cases where you need a refresh, for example if you\nhave made a copy of a git-tracked directory with 'cp -r'.\n\n- Thomas\n\n-- \nThomas Rast\ntrast@student.ethz.ch\n\n\n"},{"id":"88299","messageId":"20080823173548.GD23800@genesis.frugalware.org","threadId":"15170","inReplyTo":"20080822191324.GO10819@cs-wsok.swansea.ac.uk","subject":"Re: strange temporary pull-errors","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-08-23T17:35:48Z","receivedAt":"2008-08-23T17:35:48Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Fri, Aug 22, 2008 at 08:13:24PM +0100, Oliver Kullmann wrote:\n> > git pull\n> Updating 688e3cb..d9b9324\n> error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer\n> ge.\n> > git status\n> # On branch master\n> # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.\n> #\n> nothing to commit (working directory clean)\n> > git pull\n> Updating 688e3cb..d9b9324\n> Fast forward\n> Buildsystem/Configuration/Html/local_html.mak | 3 +\n> .../Configuration/ReleaseProcess/ReleaseHistory | 1 +\n> Buildsystem/Html/Local/History.html | 11 +++-\n> Buildsystem/Html/Local/PackageHistory.html | 52 ++++++++++++++++++++\n> Buildsystem/Html/Local/plans/History.hpp | 2 +-\n> Buildsystem/Html/Local/plans/milestones.hpp | 4 +-\n> Buildsystem/OKlibBuilding/Targets/html/Makefile | 1 +\n> Buildsystem/ReleaseProcess/README | 9 +++-\n> Buildsystem/ReleaseProcess/plans/general.hpp | 5 +-\n> Buildsystem/ReleaseProcess/plans/milestones.hpp | 4 +-\n> plans/general.hpp | 7 ++-\n> 11 files changed, 87 insertions(+), 12 deletions(-)\n> create mode 100644 Buildsystem/Html/Local/PackageHistory.html\n> \n> \n> There is nothing special going out, the simple pull should succeed, but\n> I have to try several times; don't know whether the \"git status\" is\n> instrumental here or not --- will try the next time.\n\nYes, it is. It runs git update-index --refresh.\n\nI think Junio fixed this two days ago in 9ca8f60 (\"git-merge\": allow\nfast-forwarding in a stat-dirty tree). Could you please confirm?\n\nThanks.\n"}]}