From: Fabien Thomas <thomas.fabien@gmail.com>
Date: Thu, 18 Dec 2008 20:02:33 GMT
Subject: [topgit] shared topic branch
Message-ID: <EFB70468-7900-4B22-925D-3FC5F05F951B@gmail.com>

Hi,

I'm testing topgit 0.5 in a shared env. (multiple user working on same  
patch).

After following the tutorial i end up with something like this:

$ git branch
   master
   topic/test1
* topic/test2
$ git branch -r
   origin/HEAD
   origin/master
   origin/svn_stable_7
   origin/svn_trunk
   origin/top-bases/topic/test1
   origin/top-bases/topic/test2
   origin/topic/test1
   origin/topic/test2

My problem is that when i want to push my local work i'm doing "git  
push" that will force update the remote branch.
The problem is that each time master is not up to date i will push my  
entire master or topic branch to the remote.

After looking at git config file it seems that this is something  
normal generated by "tg remote --populate origin":

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
[remote "origin"]
	url = ssh://git@xxx.com
	fetch = +refs/heads/*:refs/remotes/origin/*
	fetch = +refs/top-bases/*:refs/remotes/origin/top-bases/*
	push = +refs/top-bases/*:refs/top-bases/*
	push = +refs/heads/*:refs/heads/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[merge "ours"]
	name = \"always keep ours\" merge driver
	driver = touch %A
[topgit]
	remote = origin

What i'm doing wrong ?

Regards,
Fabien