{"thread":{"id":"11332","subject":"how to properly update dumb-hosted repo (using rsync..?)","startedAt":"2007-12-17T23:11:47Z","lastAt":"2007-12-17T23:46:44Z","messageCount":2,"participants":["Stephen Sinclair","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"63516","messageId":"9b3e2dc20712171511r41e6bd4p64d243747ad4d2af@mail.gmail.com","threadId":"11332","inReplyTo":null,"subject":"how to properly update dumb-hosted repo (using rsync..?)","fromName":"Stephen Sinclair","fromEmail":"radarsat1@gmail.com","sentAt":"2007-12-17T23:11:47Z","receivedAt":"2007-12-17T23:11:47Z","isPatch":false,"sender":{"key":"radarsat1@gmail.com","avatar":null},"body":"Hello!\n\nI have a question related to dumb transports (i.e., http hosting without git).\n\nI have a shell-accessible server which on which I have installed git,\nbut it is not a web server.  So to make my git repo public I have put\nthe repo on a web server which I cannot install git on.  I have made a\npost-update hook on my server repo which runs git-update-server-info\nand then uses rsync to copy the repo over to the public web server.\nSo far so good.  I am able to clone the http-hosted repo and push\nchanges to my private server which then get copied over to the http\nrepo.\n\nHowever, after a git-push/rsync operation, I typed git-pull to try and\npull the changes I'd just made, and got the following:\n\n-------------------\n$ git-pull\nWarning: No merge candidate found because value of config option\n         \"branch.master.merge\" does not match any remote branch fetched.\nNo changes.\n-------------------\n\nHowever I haven't done any branching in this cloned repo, it is\nimmediately after a git-clone from the web server.\n\nMy .git/config basically looks like this, minus the \"core\" section:\n\n-------------------\n[remote \"origin\"]\n        url = http://my.server.com/git/project.git\n        fetch = +refs/heads/*:refs/remotes/origin/*\n[branch \"master\"]\n        remote = origin\n        merge = refs/heads/master\n-------------------\n\nWhich seems fine to me...\nAny ideas?\nThis is of course only for people who want to clone my web-hosted repo\nand then be able to subsequently git-pull my updates.\n\nthanks,\nSteve\n"},{"id":"63525","messageId":"7v3au06g0r.fsf@gitster.siamese.dyndns.org","threadId":"11332","inReplyTo":"9b3e2dc20712171511r41e6bd4p64d243747ad4d2af@mail.gmail.com","subject":"Re: how to properly update dumb-hosted repo (using rsync..?)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-17T23:46:44Z","receivedAt":"2007-12-17T23:46:44Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Stephen Sinclair\" <radarsat1@gmail.com> writes:\n\n> $ git-pull\n> Warning: No merge candidate found because value of config option\n>          \"branch.master.merge\" does not match any remote branch fetched.\n> No changes.\n> -------------------\n>\n> However I haven't done any branching in this cloned repo, it is\n> immediately after a git-clone from the web server.\n>\n> My .git/config basically looks like this, minus the \"core\" section:\n>\n> -------------------\n> [remote \"origin\"]\n>         url = http://my.server.com/git/project.git\n>         fetch = +refs/heads/*:refs/remotes/origin/*\n> [branch \"master\"]\n>         remote = origin\n>         merge = refs/heads/master\n> -------------------\n>\n> Which seems fine to me...\n> Any ideas?\n\nA dumb question.  does \"git ls-remote origin\" show what you expect to be\nthere?  Specifically, does refs/heads/master exist?\n"}]}