From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Implementing branch attributes in git config Date: Thu, 11 May 2006 10:22:27 -0700 Message-ID: <7vejz0wk6k.fsf@assigned-by-dhcp.cox.net> References: <1147037659.25090.25.camel@dv> <7vbqu9i6zl.fsf@assigned-by-dhcp.cox.net> <7virogc90u.fsf@assigned-by-dhcp.cox.net> <7v1wv4c7wk.fsf@assigned-by-dhcp.cox.net> <7vzmhr3wje.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Johannes Schindelin , sean X-From: git-owner@vger.kernel.org Thu May 11 19:22:49 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FeEry-0005jr-DE for gcvg-git@gmane.org; Thu, 11 May 2006 19:22:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030385AbWEKRWb (ORCPT ); Thu, 11 May 2006 13:22:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030386AbWEKRWb (ORCPT ); Thu, 11 May 2006 13:22:31 -0400 Received: from fed1rmmtao02.cox.net ([68.230.241.37]:2954 "EHLO fed1rmmtao02.cox.net") by vger.kernel.org with ESMTP id S1030385AbWEKRWa (ORCPT ); Thu, 11 May 2006 13:22:30 -0400 Received: from assigned-by-dhcp.cox.net ([68.4.9.127]) by fed1rmmtao02.cox.net (InterMail vM.6.01.06.01 201-2131-130-101-20060113) with ESMTP id <20060511172229.VMUY15447.fed1rmmtao02.cox.net@assigned-by-dhcp.cox.net>; Thu, 11 May 2006 13:22:29 -0400 To: Linus Torvalds In-Reply-To: (Linus Torvalds's message of "Tue, 9 May 2006 12:24:02 -0700 (PDT)") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Linus Torvalds writes: > On Tue, 9 May 2006, Junio C Hamano wrote: >> >> If we are shooting for "let's not do this again", I do not think >> (4) without some quoting convention is good enough. Today, we >> are talking about branch names so we could give them artificial >> limits, which could be weaker than what we already have on the >> branch names, but we would later regret that, when we start >> wanting to have other names in the configuration (e.g. people's >> names). > > Here's my suggestion as a patch. > > NOTE! This patch could be applied right now, and to all the branches (to > make 1.x, 1.2.x and 1.3.x all support the _syntax_). Even if nothing > actually uses it. Linus, I've adjusted this patch, your follow-up patch, and Sean's "extended section part is case sensitive" patch, along with the test tweak to "maint" branch. I also prepared them to be mergeable to the "master" branch. Tentatively it is in "next" for testing. I'm ready to push out "maint" (not tagged as 1.3.3 yet) and "next", but have not done so. I understand the plan is to have 1.3.3 out from this "maint", and also merge this in "master" about the same time, but I am expecting I will be offline for the rest of the week most of the time, so it would happen over the weekend at the earliest. Does that sound good to you? I do not think we would need v1.1.7 nor v1.2.7 for this. People who have stayed at v1.1.6 or v1.2.6 would need to update if they are going to use newer git in their repo anyway, and I do not think of a reason not to update to 1.3.3 but update to 1.1.7 or 1.2.7 in order to stay at the feature level of 1.1.X or 1.2.X series. We haven't made incompatible changes as far as I remember. Here is what the (adjusted) test case in "next" looks like. Corresponding one in "maint" lack --list so does not have the last hunk. The "maint" and "next" branches I have locally both passes the test. -- >8 -- diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 7090ea9..8260d57 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -229,7 +229,7 @@ test_expect_failure 'invalid key' 'git-r test_expect_success 'correct key' 'git-repo-config 123456.a123 987' test_expect_success 'hierarchical section' \ - 'git-repo-config 1.2.3.alpha beta' + 'git-repo-config Version.1.2.3eX.Alpha beta' cat > expect << EOF [beta] ; silly comment # another comment @@ -241,8 +241,8 @@ # empty line NoNewLine = wow2 for me [123456] a123 = 987 -[1.2.3] - alpha = beta +[Version "1.2.3eX"] + Alpha = beta EOF test_expect_success 'hierarchical section value' 'cmp .git/config expect' @@ -251,7 +251,7 @@ cat > expect << EOF beta.noindent=sillyValue nextsection.nonewline=wow2 for me 123456.a123=987 -1.2.3.alpha=beta +version.1.2.3eX.alpha=beta EOF test_expect_success 'working --list' \