From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: auto-merge after push? Date: Sat, 11 Jul 2009 23:38:31 +0300 Message-ID: <20090711203831.GA10875@redhat.com> References: <20090511142326.GA18260@redhat.com> <20090511201705.GA21045@redhat.com> <20090611104020.GA12036@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Junio C Hamano To: Johannes Schindelin X-From: git-owner@vger.kernel.org Sat Jul 11 22:39:37 2009 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 1MPjM5-0000dk-HD for gcvg-git-2@gmane.org; Sat, 11 Jul 2009 22:39:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753984AbZGKUjZ (ORCPT ); Sat, 11 Jul 2009 16:39:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753430AbZGKUjY (ORCPT ); Sat, 11 Jul 2009 16:39:24 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55938 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbZGKUjX (ORCPT ); Sat, 11 Jul 2009 16:39:23 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6BKdHYc017025; Sat, 11 Jul 2009 16:39:18 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6BKdHRK010354; Sat, 11 Jul 2009 16:39:17 -0400 Received: from redhat.com (vpn-10-21.str.redhat.com [10.32.10.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6BKdDvm009543; Sat, 11 Jul 2009 16:39:14 -0400 Content-Disposition: inline In-Reply-To: <20090611104020.GA12036@redhat.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Jun 11, 2009 at 01:40:20PM +0300, Michael S. Tsirkin wrote: > On Mon, May 11, 2009 at 11:03:27PM +0200, Johannes Schindelin wrote: > > Hi, > > > > On Mon, 11 May 2009, Michael S. Tsirkin wrote: > > > > > On Mon, May 11, 2009 at 05:18:06PM +0200, Johannes Schindelin wrote: > > > > The thing is, a merge can fail. And then you already need direct access > > > > to the working directory in question. > > > > > > > > If you were actually talking about fast-forward pushes (because you did > > > > the merge locally already), this might help you: > > > > > > > > http://thread.gmane.org/gmane.comp.version-control.git/110251 > > > > > > Sounds good. But it looks like this patch is unlikely to be merged, does > > > it not? > > > > Unlikely to be merged by Junio? Without success stories, certainly. > > > > But you can do the same as I did: run your local Git with that patch. I > > am actually growing fonder and fonder of denyCurrentBranch=updateInstead. > > It works beautifully here. > > > > Of course, I always know what I am doing. > > > > Ciao, > > Dscho > > > > P.S.: :-) > > So here's a success story: > > I have been using this patch for 1 month now, on all my trees, with > denyCurrentBranch=updateInstead > I find it very useful for several reasons: > - I commit on my development machine, then push to test machine > - I debug and fix an issue on test machine, push change back to devel machine > - If I'm going from home to the office, I just push into the machine at the office, and when > I get there the tree is set up and ready for me to hack on, same on my way back > > Of course all the same things can be accomplished with a set of scripts, > but frankly I never got them to be as flexible and easy to use as this > patch. This patch simply works for me. Thanks for it Johannes, and I > hope it makes it into upstream at some point, so that more people can > benefit from it. Hey, Johannes, so .. how about trying to push it out to Junio? Maybe if this lands in pu more people will try it and there will be more success stories? -- MST