[topgit] shared topic branch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxx
	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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux