From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Dec 2007 23:46:44 GMT
Subject: Re: how to properly update dumb-hosted repo (using rsync..?)
Message-ID: <7v3au06g0r.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <9b3e2dc20712171511r41e6bd4p64d243747ad4d2af@mail.gmail.com>

"Stephen Sinclair" <radarsat1@gmail.com> writes:

> $ git-pull
> Warning: No merge candidate found because value of config option
>          "branch.master.merge" does not match any remote branch fetched.
> No changes.
> -------------------
>
> However I haven't done any branching in this cloned repo, it is
> immediately after a git-clone from the web server.
>
> My .git/config basically looks like this, minus the "core" section:
>
> -------------------
> [remote "origin"]
>         url = http://my.server.com/git/project.git
>         fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
>         remote = origin
>         merge = refs/heads/master
> -------------------
>
> Which seems fine to me...
> Any ideas?

A dumb question.  does "git ls-remote origin" show what you expect to be
there?  Specifically, does refs/heads/master exist?