DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=ymail.com;
	h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding;
	b=wSAdPGZBujFAIj5EuTXkz6zBag0S1/kqlOKPXB2MDeiA/FgRMNepCcd8zRrEjxbrSvHmiW38TioQbU9uwrFIcTV3M/4aRs+hf20F5SYOQAGuh2M0wyMHQiEiIbogEqWVc9JsiRIzWNuuP55hzWeFzH0Ow0bOXWlDd4qJTUdKfKQ=;
References: <19759.1362357835@sss.pgh.pa.us>
	<20130304020324.GE16142@tamriel.snowman.net>
	<2480.1362363162@sss.pgh.pa.us>
	<20130304023335.GH16142@tamriel.snowman.net>
	<CABUevEwfw24iF9-czueLSmdFQwck012qfVmLXcoKbG37xG56jQ@mail.gmail.com>
	<CABUevEzM2F8qAxVds9Me-41L5BqeEGO4DuosCQhC0C6v05HPUw@mail.gmail.com>
	<1362402660.43431.YahooMailNeo@web162901.mail.bf1.yahoo.com>
	<CABUevEwvWyCfGn8oZZTSPtQb513Kvn2LPZPSPoiha5e+J3=W8w@mail.gmail.com>
Message-ID: <1362405162.66623.YahooMailNeo@web162904.mail.bf1.yahoo.com>
Date: Mon, 4 Mar 2013 05:52:42 -0800 (PST)
From: Kevin Grittner <kgrittn@ymail.com>
Reply-To: Kevin Grittner <kgrittn@ymail.com>
Subject: Re: gitweb is no longer a real-time view
To: Magnus Hagander <magnus@hagander.net>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, Peter Eisentraut <peter_e@gmx.net>,
	PostgreSQL WWW <pgsql-www@postgresql.org>,
	Stephen Frost <sfrost@snowman.net>
In-Reply-To: 
 <CABUevEwvWyCfGn8oZZTSPtQb513Kvn2LPZPSPoiha5e+J3=W8w@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
Sender: pgsql-www-owner@postgresql.org

Magnus Hagander <magnus@hagander.net> wrote:

> Question still remains how then.
>
> Normally it should, AFAIK, refuse to do such a push without a --force.
> But admittedly, I don't know for sure exactly how those more complex
> setups work.
>
> Do you by any chance have any other git settings either in your local
> or in the repository config?
>
> Also, can someone who knows how that stuff is set up, explain why it's
> pushing anonymous/master in this case? Seems like it should just push
> the actual branch, no? Are those instructions for usage wrong?
>
>
>> kgrittn@Kevin-Desktop:~/pg/postgresql.git$ git remote --verbose
>> origin=A0 ssh://git@gitmaster.postgresql.org/postgresql.git (fetch)
>> origin=A0 ssh://git@gitmaster.postgresql.org/postgresql.git (push)
>> kgrittn@Kevin-Desktop:~/pg/postgresql.git$ cd ../master
>> kgrittn@Kevin-Desktop:~/pg/master$ pull
>> remote: Counting objects: 31, done.
>> remote: Compressing objects: 100% (16/16), done.
>> remote: Total 16 (delta 15), reused 0 (delta 0)
>> Unpacking objects: 100% (16/16), done.
>> From /home/kgrittn/pg/postgresql
>>=A0=A0 + 3a21ef1...b15a6da master=A0=A0=A0 -> origin/master=A0 (forced up=
date)
>
> ^^ there's another forced update. Which seems to indicate that your
> git is doing forced updates by default in both directions.
>
> I have no idea how it would do that by default - I've always received
> an error when accidentally doing something like that...

Are there any files to look at besides these?:

kgrittn@Kevin-Desktop:~/pg/master$ cat ~/.gitconfig
[user]
=A0=A0=A0=A0=A0=A0=A0 name =3D Kevin Grittner
=A0=A0=A0=A0=A0=A0=A0 email =3D kgrittn@postgresql.org
[core]
=A0=A0=A0=A0=A0=A0=A0 excludesfile =3D /home/kgrittn/.gitexcludesfile
=A0=A0=A0=A0=A0=A0=A0 pager =3D less -x4
=A0=A0=A0 editor =3D vim
kgrittn@Kevin-Desktop:~/pg/master$ cat .git/config
[core]
=A0=A0=A0=A0=A0=A0=A0 repositoryformatversion =3D 0
=A0=A0=A0=A0=A0=A0=A0 filemode =3D true
=A0=A0=A0=A0=A0=A0=A0 bare =3D false
=A0=A0=A0=A0=A0=A0=A0 logallrefupdates =3D true
[remote "origin"]
=A0=A0=A0=A0=A0=A0=A0 fetch =3D +refs/heads/master:refs/remotes/origin/mast=
er
=A0=A0=A0=A0=A0=A0=A0 url =3D /home/kgrittn/pg/postgresql
[branch "master"]
=A0=A0=A0=A0=A0=A0=A0 remote =3D origin
=A0=A0=A0=A0=A0=A0=A0 merge =3D refs/heads/master
=A0=A0=A0=A0=A0=A0=A0 rebase =3D true
[remote "github"]
=A0=A0=A0=A0=A0=A0=A0 url =3D git@github.com:kgrittn/postgres.git
=A0=A0=A0=A0=A0=A0=A0 fetch =3D +refs/heads/*:refs/remotes/github/*
kgrittn@Kevin-Desktop:~/pg/master$ cat ../postgresql.git/config
[core]
=A0=A0=A0=A0=A0=A0=A0 repositoryformatversion =3D 0
=A0=A0=A0=A0=A0=A0=A0 filemode =3D true
=A0=A0=A0=A0=A0=A0=A0 bare =3D true
[remote "origin"]
=A0=A0=A0=A0=A0=A0=A0 fetch =3D +refs/*:refs/*
=A0=A0=A0=A0=A0=A0=A0 mirror =3D true
=A0=A0=A0=A0=A0=A0=A0 url =3D ssh://git@gitmaster.postgresql.org/postgresql=
.git

The rebase option was something I did because the Wiki instructions
told me to:

http://wiki.postgresql.org/wiki/Committing_with_Git#Dependent_Clone_per_Bra=
nch.2C_Pushing_and_Pulling_From_a_Local_Repository
=A0
I don't think there is anything there which wasn't done per
instructions, but maybe the Wiki needs a fix?

--=20
Kevin Grittner
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


--=20
Sent via pgsql-www mailing list (pgsql-www@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-www