{"thread":{"id":"3843","subject":"git pull origin doesn't update the master","startedAt":"2006-04-10T04:41:05Z","lastAt":"2006-04-10T07:24:42Z","messageCount":6,"participants":["Aneesh Kumar","sean","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18527","messageId":"cc723f590604092141q3517136cmc0a895a069021b8f@mail.gmail.com","threadId":"3843","inReplyTo":null,"subject":"git pull origin doesn't update the master","fromName":"Aneesh Kumar","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-04-10T04:41:05Z","receivedAt":"2006-04-10T04:41:05Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"While updating the git code base the master branch is not getting\nupdated. First look tell me that the below commit is the issue\na9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90\n\ngit-pull.sh does\ngit-fetch --update-head-ok \"$@\" || exit 1\n\nand git-fetch.sh exit with status 1 printing the below message\n\n* refs/heads/pu: does not fast forward to branch 'pu' of\nhttp://git.kernel.org/pub/scm/git/git;\n not updating.\n\n\n-aneesh\n"},{"id":"18528","messageId":"cc723f590604092151p7c8c44e3g14decc09c0e24383@mail.gmail.com","threadId":"3843","inReplyTo":"cc723f590604092141q3517136cmc0a895a069021b8f@mail.gmail.com","subject":"Re: git pull origin doesn't update the master","fromName":"Aneesh Kumar","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-04-10T04:51:34Z","receivedAt":"2006-04-10T04:51:34Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"On 4/10/06, Aneesh Kumar wrote:\n> While updating the git code base the master branch is not getting\n> updated. First look tell me that the below commit is the issue\n> a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90\n>\n> git-pull.sh does\n> git-fetch --update-head-ok \"$@\" || exit 1\n>\n> and git-fetch.sh exit with status 1 printing the below message\n>\n> * refs/heads/pu: does not fast forward to branch 'pu' of\n> http://git.kernel.org/pub/scm/git/git;\n> not updating.\n>\n>\n\n\nI think the git-update-server-info is not run on kernel.org. I am\nusing the http fetch\n\n562036a04223709de4922873238462007bcb529f\trefs/heads/pu\n$ more pu\nc52d221ba03c84e0b818d19f7ec30cb4d75fe509\n$\n\n-aneesh\n"},{"id":"18529","messageId":"BAYC1-PASMTP11D3D1D967525A6F029F85AECC0@CEZ.ICE","threadId":"3843","inReplyTo":"cc723f590604092141q3517136cmc0a895a069021b8f@mail.gmail.com","subject":"Re: git pull origin doesn't update the master","fromName":"sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2006-04-10T05:03:16Z","receivedAt":"2006-04-10T05:03:16Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Mon, 10 Apr 2006 10:11:05 +0530\n\"Aneesh Kumar\" wrote:\n\n> While updating the git code base the master branch is not getting\n> updated. First look tell me that the below commit is the issue\n> a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90\n> \n> git-pull.sh does\n> git-fetch --update-head-ok \"$@\" || exit 1\n> \n> and git-fetch.sh exit with status 1 printing the below message\n> \n> * refs/heads/pu: does not fast forward to branch 'pu' of\n> http://git.kernel.org/pub/scm/git/git;\n> not updating.\n> \n\nThe \"pu\" branch often won't fast forward because some commits have\nbeen completely deleted in it since the last time you pulled.\n\nIf you want to track it, add a plus (+) sign to the proper line in \nyour .git/remotes/origin file, like this:\n\nPull: +refs/heads/pu:refs/heads/pu\n\nWhich tells git to deal with the problem for you by merging instead\nof fast forwarding. Or you can just delete that line completely\nif you don't want to track the pu branch at all.\n\nHTH,\nSean\n"},{"id":"18531","messageId":"7vr7469c4n.fsf@assigned-by-dhcp.cox.net","threadId":"3843","inReplyTo":"cc723f590604092141q3517136cmc0a895a069021b8f@mail.gmail.com","subject":"Re: git pull origin doesn't update the master","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-10T06:29:44Z","receivedAt":"2006-04-10T06:29:44Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aneesh Kumar\" writes:\n\n> While updating the git code base the master branch is not getting\n> updated. First look tell me that the below commit is the issue\n> a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90\n>\n> git-pull.sh does\n> git-fetch --update-head-ok \"$@\" || exit 1\n\nYes, this was done as an response to an explicit request from\nAndrew Morten.\n\nWhat Sean said about \"pu\" branch is correct.\n"},{"id":"18532","messageId":"cc723f590604092345r7d0e2cedr8f9838d054ecb023@mail.gmail.com","threadId":"3843","inReplyTo":"7vr7469c4n.fsf@assigned-by-dhcp.cox.net","subject":"Re: git pull origin doesn't update the master","fromName":"Aneesh Kumar","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-04-10T06:45:36Z","receivedAt":"2006-04-10T06:45:36Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"On 4/10/06, Junio C Hamano wrote:\n> \"Aneesh Kumar\" writes:\n>\n> > While updating the git code base the master branch is not getting\n> > updated. First look tell me that the below commit is the issue\n> > a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90\n> >\n> > git-pull.sh does\n> > git-fetch --update-head-ok \"$@\" || exit 1\n>\n> Yes, this was done as an response to an explicit request from\n> Andrew Morten.\n>\n> What Sean said about \"pu\" branch is correct.\n>\n>\nSean suggestion worked for me.\n\nWork flow is now a bit complicated. I clone the repository. Now i need\nto edit remotes/origin to make sure what all branches i need to\nfollow. And then do a git pull origin. Earlier i just need to do a\nclone and a git pull. I don't need to fast forward pu branch. But then\ni need to get the update of master branch. since git-fetch fails\nupdate pu branch git pull origin fails to update master branch also\nwhich i am really interested.\n\n-aneesh\n"},{"id":"18533","messageId":"7vmzetao5h.fsf@assigned-by-dhcp.cox.net","threadId":"3843","inReplyTo":"cc723f590604092345r7d0e2cedr8f9838d054ecb023@mail.gmail.com","subject":"Re: git pull origin doesn't update the master","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-10T07:24:42Z","receivedAt":"2006-04-10T07:24:42Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aneesh Kumar\" writes:\n\n> Work flow is now a bit complicated. I clone the repository. Now i need\n> to edit remotes/origin to make sure what all branches i need to\n> follow. And then do a git pull origin. Earlier i just need to do a\n> clone and a git pull. I don't need to fast forward pu branch.\n\nWhat you are saying is that the previous round did a wrong thing\nwithout telling the user, and it just happened that you did not\ncare about the wrong thing it did.\n\nIt is a gentle reminder that heads that are rewound need to be\nadvertised as such. It is conceivable that in future versions\nof git we might want to be able to mark some branches \"this is\nexpected to be rewound\" explicitly and make the clone operation\nto take notice, to give you the plus sign automatically.\n"}]}