{"thread":{"id":"16173","subject":"git pull regression?","startedAt":"2008-11-04T22:27:49Z","lastAt":"2008-11-05T09:48:35Z","messageCount":4,"participants":["Carlos R. Mafra","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"94924","messageId":"20081104222749.GA9296@localhost.aei.mpg.de","threadId":"16173","inReplyTo":null,"subject":"git pull regression?","fromName":"Carlos R. Mafra","fromEmail":"crmafra2@gmail.com","sentAt":"2008-11-04T22:27:49Z","receivedAt":"2008-11-04T22:27:49Z","isPatch":false,"sender":{"key":"crmafra2@gmail.com","avatar":null},"body":"Hi,\n\nI tested git v1.6.0.3 today and noticed that git pull is\nbehaving strangely, compared to what I was used to with\nv1.5.6.3\n\nIt no longer tells me \"Already up-to-date.\" when it used\nto, now it simply says nothing.\n\nAnd when I pulled Linus tree for the kernel this morning \nit downloaded the new commits but git didn't show the \ndiffstat.\n\nFurthermore, it kept saying to me \n\"Your branch is behind 'origin/master' by 31 commits, \nand can be fast-forwarded\"\nand git log was not showing the new commits.\n\nAt first I thought I had made some mistake with my repo,\nbut I searched the mailing list and there was a similar\ncase which was \"fixed\" after using 'git status' followed\nby another 'git pull'. But in my case it did not help.\n\nSo I went back to v1.5.6.3 and everything was back\nto normal.\n\nAfter that I made some tests, and v1.6.0 was good\nand v1.6.0.1 was bad, but I didn't bisect it\nfurther.\n\nIt looks like a regression to me. I can finish\nthe bisection if people in the list say that\nI am not making a mistake somewhere :-)\n"},{"id":"94933","messageId":"7vtzanoyg0.fsf@gitster.siamese.dyndns.org","threadId":"16173","inReplyTo":"20081104222749.GA9296@localhost.aei.mpg.de","subject":"Re: git pull regression?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-04T23:37:03Z","receivedAt":"2008-11-04T23:37:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Carlos R. Mafra\" writes:\n\n> It looks like a regression to me. I can finish\n> the bisection if people in the list say that\n> I am not making a mistake somewhere :-)\n\nInteresting, and _sounds_ like a regression, but I do not think anybody\ncan tell if it is without looking at what .git/config and exact command\nsequence you are using for this \"git pull\" and where you are starting\nfrom.\n"},{"id":"94964","messageId":"20081105083810.GA22318@localhost.aei.mpg.de","threadId":"16173","inReplyTo":"7vtzanoyg0.fsf@gitster.siamese.dyndns.org","subject":"Re: git pull regression?","fromName":"Carlos R. Mafra","fromEmail":"crmafra2@gmail.com","sentAt":"2008-11-05T08:38:10Z","receivedAt":"2008-11-05T08:38:10Z","isPatch":false,"sender":{"key":"crmafra2@gmail.com","avatar":null},"body":"On Tue 4.Nov'08 at 15:37:03 -0800, Junio C Hamano wrote:\n> \"Carlos R. Mafra\" writes:\n> \n> > It looks like a regression to me. I can finish\n> > the bisection if people in the list say that\n> > I am not making a mistake somewhere :-)\n> \n> Interesting, and _sounds_ like a regression, but I do not think anybody\n> can tell if it is without looking at what .git/config and exact command\n> sequence you are using for this \"git pull\" and where you are starting\n> from.\n\nOk, I am sorry for the lack of details, which I provide now.\n\nIt happened again with the git repo itself (Linus hasn't \nupdated his yet).\n\n[mafra@localhost:git]$ cat .git/config\n[core]\n repositoryformatversion = 0\n filemode = true\n bare = false\n logallrefupdates = true\n[remote \"origin\"]\n url = git://git.kernel.org/pub/scm/git/git.git\n fetch = +refs/heads/*:refs/remotes/origin/*\n[branch \"master\"]\n remote = origin\n merge = refs/heads/master\n\t\nAnd the commands were these (ok, I made a mistake that\nI pulled without being first in the master branch,\nbut the problem I am describing here also happened\nbefore, when I was already in the master branch)\n\n[mafra@localhost:git]$ git --version\ngit version 1.6.0.3\n[mafra@localhost:git]$ git log\n[mafra@localhost:git]$ git pull\nremote: Counting objects: 245, done.\nremote: Compressing objects: 100% (49/49), done.\nremote: Total 131 (delta 100), reused 109 (delta 82)\nReceiving objects: 100% (131/131), 33.91 KiB, done.\nResolving deltas: 100% (100/100), completed with 43 local objects.\nFrom git://git.kernel.org/pub/scm/git/git\n aa17c7c..826ea6f html -> origin/html\n a5a323f..16088d8 maint -> origin/maint\n 1655dcb..1e98488 man -> origin/man\n 9f8f132..5508064 master -> origin/master\n 58edc95..494ccbd next -> origin/next\n + fe6aa64...a5f8d19 pu -> origin/pu (forced update)\nYou asked me to pull without telling me which branch you\nwant to merge with, and 'branch..merge' in\nyour configuration file does not tell me either. Please\nname which branch you want to merge on the command line and\ntry again (e.g. 'git pull ').\nSee git-pull(1) for details on the refspec.\n\nIf you often merge with the same branch, you may want to\nconfigure the following variables in your configuration\nfile:\n\n branch..remote = \n branch..merge = \n remote..url = \n remote..fetch = \n\nSee git-config(1) for details.\n[mafra@localhost:git]$ git branch\n* (no branch)\n master\n[mafra@localhost:git]$ git checkout master\nPrevious HEAD position was 031e6c8... GIT 1.6.0.3\nSwitched to branch \"master\"\nYour branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.\n[mafra@localhost:git]$ git pull\n[mafra@localhost:git]$ git status\n# On branch master\n# Your branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.\n#\n# Untracked files:\n# (use \"git add ...\" to include in what will be committed)\n#\n# git-help--browse\n# git-merge-stupid\n# test-absolute-path\nnothing added to commit but untracked files present (use \"git add\" to track)\n[mafra@localhost:git]$ git pull\n[mafra@localhost:git]$\n\nNotice how \"git pull\" doesn't say \"Already up-to-date\" anymore.\n\nAnd now 'git log' shows me the last commit being \n9f8f132621faedd instead of the really last one 550806439402\n\nThese are the same issues that I described in the first email\nwhen I updated Linus' tree, so they are not due to the mistake\nof not being in master branch.\n\nAnd now if I go back to v1.6.0 I get this\n\n[mafra@localhost:git]$ git checkout master\nSwitched to branch \"master\"\nYour branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.\n[mafra@localhost:git]$ git pull\nUpdating 9f8f132..5508064\nFast forward\n Documentation/Makefile | 8 ++++-\n Documentation/git-format-patch.txt | 3 +-\n INSTALL | 5 ++-\n Makefile | 6 ++++\n contrib/hooks/post-receive-email | 57 ++++++++++++++++++++++++++++++------\n 5 files changed, 65 insertions(+), 14 deletions(-)\n[mafra@localhost:git]$\n\nand everything is ok again.\n\nAnything else I can do to help or is bisection the last resort? :-)\n\nThanks,\nCarlos\n"},{"id":"94966","messageId":"20081105094835.GA29316@localhost.aei.mpg.de","threadId":"16173","inReplyTo":"20081105083810.GA22318@localhost.aei.mpg.de","subject":"Re: git pull regression?","fromName":"Carlos R. Mafra","fromEmail":"crmafra2@gmail.com","sentAt":"2008-11-05T09:48:35Z","receivedAt":"2008-11-05T09:48:35Z","isPatch":false,"sender":{"key":"crmafra2@gmail.com","avatar":null},"body":"On Wed 5.Nov'08 at 9:38:10 +0100, Carlos R. Mafra wrote:\n> On Tue 4.Nov'08 at 15:37:03 -0800, Junio C Hamano wrote:\n> > \"Carlos R. Mafra\" writes:\n> > \n> > > It looks like a regression to me. I can finish\n> > > the bisection if people in the list say that\n> > > I am not making a mistake somewhere :-)\n> > \n> > Interesting, and _sounds_ like a regression, but I do not think anybody\n> > can tell if it is without looking at what .git/config and exact command\n> > sequence you are using for this \"git pull\" and where you are starting\n> > from.\n\nHm...that what I feared most has just happened.\n\nI tried to bisect my problem when I realized that it wasn't\ngoint to take 2 hours and a lot of reboots like with the kernel :-)\n\nAnd I soon realized that something was wrong when I was\nrunning 'make install'. I had two terminals open, one with\nthe regular user with which I was compiling git, and the\nother with the root user where I run 'make install'.\n\nAfter compiling with the regular user and running\n'make install' with the root user from the other terminal\nthe whole compilation was happening again and strangely\nit was installing things in the prefix /root instead of\n/usr/local\n\nI simply don't know why this happened nor how. But \nsomehow my git installation was screwed.\n\nI have just compiled the latest git and it is ok now.\n\nI am really sorry for all the noise, but I was \nsincerely fooled by the symptoms (as you can see\nin the previous email).\n"}]}