public inbox for [email protected]  

help / color / mirror / Atom feed

From: Kevin Grittner <[email protected]>
To: Magnus Hagander <[email protected]>
Cc: Tom Lane <[email protected]>
Cc: Peter Eisentraut <[email protected]>
Cc: PostgreSQL WWW <[email protected]>
Cc: Stephen Frost <[email protected]>
Subject: Re: gitweb is no longer a real-time view
Date: Mon, 4 Mar 2013 05:52:42 -0800 (PST)
Message-ID: <[email protected]> (raw)
In-Reply-To: <CABUevEwvWyCfGn8oZZTSPtQb513Kvn2LPZPSPoiha5e+J3=W8w@mail.gmail.com>
References: <[email protected]>
	<[email protected]>
	<[email protected]>
	<[email protected]>
	<CABUevEwfw24iF9-czueLSmdFQwck012qfVmLXcoKbG37xG56jQ@mail.gmail.com>
	<CABUevEzM2F8qAxVds9Me-41L5BqeEGO4DuosCQhC0C6v05HPUw@mail.gmail.com>
	<[email protected]>
	<CABUevEwvWyCfGn8oZZTSPtQb513Kvn2LPZPSPoiha5e+J3=W8w@mail.gmail.com>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgsql-www>

Magnus Hagander <[email protected]> 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  ssh://[email protected]/postgresql.git (fetch)
>> origin  ssh://[email protected]/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
>>   + 3a21ef1...b15a6da master    -> origin/master  (forced update)
>
> ^^ 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]
        name = Kevin Grittner
        email = [email protected]
[core]
        excludesfile = /home/kgrittn/.gitexcludesfile
        pager = less -x4
    editor = vim
kgrittn@Kevin-Desktop:~/pg/master$ cat .git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/master:refs/remotes/origin/master
        url = /home/kgrittn/pg/postgresql
[branch "master"]
        remote = origin
        merge = refs/heads/master
        rebase = true
[remote "github"]
        url = [email protected]:kgrittn/postgres.git
        fetch = +refs/heads/*:refs/remotes/github/*
kgrittn@Kevin-Desktop:~/pg/master$ cat ../postgresql.git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = true
[remote "origin"]
        fetch = +refs/*:refs/*
        mirror = true
        url = ssh://[email protected]/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_Branch.2C_Pushing_and_Pullin...
 
I don't think there is anything there which wasn't done per
instructions, but maybe the Wiki needs a fix?

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


-- 
Sent via pgsql-www mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-www

view thread (43+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected], [email protected], [email protected], [email protected]
  Subject: Re: gitweb is no longer a real-time view
  In-Reply-To: <[email protected]>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox