Linus Torvalds <torvalds@osdl.org> writes: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' \ - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| H. Peter Anvin | Re: [RFC 00/15] x86_64: Optimize percpu accesses |
| Greg Kroah-Hartman | [PATCH 008/196] Chinese: add translation of volatile-considered-harmful.txt |
| Greg KH | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Alex Chiang | [PATCH 1/4] Remove path attribute from sgi_hotplug |
git: | |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| David Miller | Re: [GIT]: Networking |
| Eric Dumazet | Re: [PATCH 3/3] Convert the UDP hash lock to RCU |
