From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabien Thomas Subject: [topgit] shared topic branch Date: Thu, 18 Dec 2008 21:02:33 +0100 Message-ID: Mime-Version: 1.0 (Apple Message framework v930.3) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Dec 18 21:04:02 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LDP6C-0005DG-NC for gcvg-git-2@gmane.org; Thu, 18 Dec 2008 21:03:57 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753514AbYLRUCj (ORCPT ); Thu, 18 Dec 2008 15:02:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753509AbYLRUCj (ORCPT ); Thu, 18 Dec 2008 15:02:39 -0500 Received: from mail-bw0-f21.google.com ([209.85.218.21]:60643 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753487AbYLRUCi (ORCPT ); Thu, 18 Dec 2008 15:02:38 -0500 Received: by bwz14 with SMTP id 14so2350674bwz.13 for ; Thu, 18 Dec 2008 12:02:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:from:to :content-type:content-transfer-encoding:mime-version:subject:date :x-mailer; bh=NMGexxEZBKSjTu3BhPTZePrLzEAU0ZzC9k5HIhwaN1w=; b=spH5CyaGvyMZLKwm4mhcdG70BQXaKuntROXlYMuA1OdDmE7on4h0l1unTwYh30iaU+ l2nY8QnxTb0+Qgxz7ktCMUOla68uOZ8h25U3a5g1XqM+oiGsKDWy7NeyWSpbRn7BrwQp a4HFNahC90hzU1MI+MXEuCmyJMoQrJZ8xHuW4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:from:to:content-type:content-transfer-encoding :mime-version:subject:date:x-mailer; b=pn3/G5tyYTQhbLRb+mh3w3GmWvRbsIvUinjDp0KTndwCEZxImwsuNh1JpXRRan+lVD PeB+KJeVlpqbMgvK271KwO7hTYT2qJ1wOOEGDKriiM/zPtcHveUIi12ler39v3mxSbo4 2QXii4wEpK1osvPyUDXhnjiIAhH2Nm8ZAtwCg= Received: by 10.103.238.4 with SMTP id p4mr917609mur.68.1229630555935; Thu, 18 Dec 2008 12:02:35 -0800 (PST) Received: from ?192.168.0.1? (abo-9-36-69.lil.modulonet.fr [85.69.36.9]) by mx.google.com with ESMTPS id 7sm6711879mup.40.2008.12.18.12.02.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 18 Dec 2008 12:02:35 -0800 (PST) X-Mailer: Apple Mail (2.930.3) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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