{"thread":{"id":"14033","subject":"git pull error message woes","startedAt":"2008-06-19T07:32:53Z","lastAt":"2008-06-19T18:57:44Z","messageCount":2,"participants":["Matthias Kestenholz","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"80295","messageId":"1213860773.6444.9.camel@localhost","threadId":"14033","inReplyTo":null,"subject":"git pull error message woes","fromName":"Matthias Kestenholz","fromEmail":"mk@spinlock.ch","sentAt":"2008-06-19T07:32:53Z","receivedAt":"2008-06-19T07:32:53Z","isPatch":false,"sender":{"key":"matthias@spinlock.ch","avatar":"https://gravatar.com/avatar/bc18f396e70163d09ab458a341b1decb7e8b6ee3aa2c0c954ec20162e67c4d46?d=mp&s=160"},"body":"Hi,\n\nI noticed strange behavior while pulling git.git today (this isn't new,\nit just occurred to me for the first time today that there is something\nwrong going on)\n\nI run the 'pu' branch most of the time, and do not create a local branch\nbecause 'pu' is constantly rebased. I just run git checkout origin/pu\nafter pulling (I know I should fetch if I don't want to fetch+merge, but\nit's hard to retrain the fingers)\n\nAlthough I am on no branch ($curr_branch is empty), I get the error\nmessage from error_on_no_merge_candidates instead of being notified that\nI am on no branch currently. Something around line 150-160 in\ngit-pull.sh does not seem to work as it should.\n\nThe reason might be, that every line in .git/FETCH_HEAD is marked as\nnot-for-merge?\n\nI don't know if that's the sign of a deeper problem or if it's just\nconfusing behavior.\n\nI tried fixing it myself, but got lost somewhere in the fetch machinery.\n\nMatthias\n"},{"id":"80351","messageId":"alpine.LNX.1.00.0806191446590.19665@iabervon.org","threadId":"14033","inReplyTo":"1213860773.6444.9.camel@localhost","subject":"Re: git pull error message woes","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-06-19T18:57:44Z","receivedAt":"2008-06-19T18:57:44Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Thu, 19 Jun 2008, Matthias Kestenholz wrote:\n\n> Hi,\n> \n> I noticed strange behavior while pulling git.git today (this isn't new,\n> it just occurred to me for the first time today that there is something\n> wrong going on)\n> \n> I run the 'pu' branch most of the time, and do not create a local branch\n> because 'pu' is constantly rebased. I just run git checkout origin/pu\n> after pulling (I know I should fetch if I don't want to fetch+merge, but\n> it's hard to retrain the fingers)\n> \n> Although I am on no branch ($curr_branch is empty), I get the error\n> message from error_on_no_merge_candidates instead of being notified that\n> I am on no branch currently. Something around line 150-160 in\n> git-pull.sh does not seem to work as it should.\n\nThere's no reason you couldn't pull when on no branch. It's just that, \nwithout a branch, there's nowhere to get a default ref to merge, which \nleads to having nothing to merge (if you don't give anything specific), \nwhich leads to that error.\n\nOn the other hand, you could do:\n\n git pull <some URL> <some branch>\n\nand git would happily merge the specified branch of the specified \nrepository for you. So the reason that git-pull doesn't give you the error \nyou expect is that that's not necessarily an error at all.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}