Re: unable to push
- From
Jeff King <peff@peff.net>
- Date
- May 31, 2008, 15:50 UTC
- Message-ID
- <20080531155036.GA27397@sigill.intra.peff.net>
- In-Reply-To
- <alpine.DEB.1.10.0805310759540.15294@asgard.lang.hm>
On Sat, May 31, 2008 at 08:03:47AM -0700, david@lang.hm wrote:
> for some reason when I try to push to my public repo I get a message that > everything is up to date, but if I switch to that repo and do a pull it > updates properly
If you "git push" without a refspec, it pushes "matching branches". See git-push(1) for more details.
> root@asgard:/var/www/adastra/xml2pdf/current# git ls-remote public > d3f3d8474db1c006a53be8b5f5c1a0d866d7e357 HEAD > d3f3d8474db1c006a53be8b5f5c1a0d866d7e357 refs/heads/localmaster
So you have only one branch, "localmaster".
> root@asgard:/var/www/adastra/xml2pdf/current# git ls-remote . > 71ab4eea48eb3407a2ff4eef2befe9251897d676 HEAD > 71ab4eea48eb3407a2ff4eef2befe9251897d676 refs/heads/master
But the remote has only one branch, "master".
If you want to push your localmaster to his master, you can do:
git push origin localmaster:master
You can also set it up permanently by adding a "remote.origin.push" line to your config file.
But I do wonder why you don't just name your local branch "master" in the first place (it won't conflict in your local repo with the remote's master, which can be named as "origin/master").
Show 12 quoted lines
> root@asgard:/var/www/git/xml2pdf.git# git pull > remote: Counting objects: 8, done. > remote: Compressing objects: 100% (6/6), done. > remote: Total 6 (delta 4), reused 0 (delta 0) > Unpacking objects: 100% (6/6), done. > From /movies/www/adastra/xml2pdf/current/ > d3f3d84..71ab4ee master -> origin/master > * [new tag] 1.8.5 -> 1.8.5 > Updating d3f3d84..71ab4ee > Fast forward > xml2pdf.pl | 22 +++++++++++----------- > 1 files changed, 11 insertions(+), 11 deletions(-)
And this pulls from master -> localmaster, presumably because you have a branch.localmaster.merge config option (which is generally set up by default these days).
-Peff