From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [PATCH] branch: optionally setup branch.*.merge from upstream local branches Date: Mon, 18 Feb 2008 13:24:54 +0000 (GMT) Message-ID: References: <1203336248-9308-1-git-send-email-jaysoffian@gmail.com> <76718490802180440o3041b1ffh4764199e2aeaa52b@mail.gmail.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org, Junio C Hamano To: Jay Soffian X-From: git-owner@vger.kernel.org Mon Feb 18 14:26:05 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 1JR60G-0004qD-VS for gcvg-git-2@gmane.org; Mon, 18 Feb 2008 14:25:53 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756088AbYBRNZJ (ORCPT ); Mon, 18 Feb 2008 08:25:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752113AbYBRNZI (ORCPT ); Mon, 18 Feb 2008 08:25:08 -0500 Received: from mail.gmx.net ([213.165.64.20]:52653 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752866AbYBRNZG (ORCPT ); Mon, 18 Feb 2008 08:25:06 -0500 Received: (qmail invoked by alias); 18 Feb 2008 13:25:05 -0000 Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74] by mail.gmx.net (mp043) with SMTP; 18 Feb 2008 14:25:05 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX19lK1UhhLllH5UYfEkMPx8RZpM8+hx5K4gzqfFXvO ZOsi+f7GNpD9KG X-X-Sender: gene099@racer.site In-Reply-To: <76718490802180440o3041b1ffh4764199e2aeaa52b@mail.gmail.com> User-Agent: Alpine 1.00 (LSU 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Mon, 18 Feb 2008, Jay Soffian wrote: > On Feb 18, 2008 7:14 AM, Johannes Schindelin wrote: > > > On Mon, 18 Feb 2008, Jay Soffian wrote: > > > > > -static int branch_track = 1; > > > +static enum branch_track branch_track = BRANCH_TRACK_FALSE; > > > > That is a clear regression. > > Perhaps. It's consistent with builtin-checkout.c though (which was > initializing it to 0). Who to believe? Well, in the way _you_ implemented it, it is a clear regression, since _your_ patch changes the 1 to a 0. > > Personally, I have no problem with typing "git merge " in your > > workflow. I would even avoid saying "git pull" for obviously-local > > branches, because I would have forgotten which branch it tracked > > originally. > > Um, well, apply this patch, set branch.autosetupmerge=always and then > branch.*.merge will tell you which branch it tracked originally. :-) That's what I meant. Rather than _looking it up_, and then saying "git pull", I'd do "git merge " _directly_. One command. Not two. > Aside, then how do you figure out the upstream branch is if you've > forgotten? Well, that's easy. I would look at the output of "git show-branch --all". But then, I usually do not care too much which branch I branched off, but which branch to merge with/rebase on. Ciao, Dscho