Thread (1 message) 1 message, 1 author, 2016-06-15

Re: how to properly update dumb-hosted repo (using rsync..?)

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:00

"Stephen Sinclair" [off-list ref] 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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help