{"thread":{"id":"15901","subject":"What's in git.git (Oct 2008, #03; Tue, 14)","startedAt":"2008-10-14T22:08:50Z","lastAt":"2008-10-24T02:44:27Z","messageCount":16,"participants":["Junio C Hamano","Brandon Casey","Mike Ralphson","Shawn O. Pearce","drafnel@gmail.com","Jeff King","Pieter de Bie","Arjen Laarhoven"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"93034","messageId":"7vej2i7rt9.fsf@gitster.siamese.dyndns.org","threadId":"15901","inReplyTo":null,"subject":"What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-14T22:08:50Z","receivedAt":"2008-10-14T22:08:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Just trying to get my development repository back in sync with what I\nreceived from Shawn. Thanks to everybody, I think maint is ready for\n1.6.0.3.\n\n* The 'maint' branch has these fixes since the last announcement.\n\nJunio C Hamano (1):\n Update draft release notes to 1.6.0.3\n\n\n* The 'master' branch has these since the last announcement\n in addition to the above.\n\nJeff King (1):\n tests: shell negation portability fix\n\nJunio C Hamano (1):\n Update draft release notes to 1.6.1\n"},{"id":"93101","messageId":"bsftmRx17krWBpVlulipoJEO1fWsD0hZfF3HOZcajX6GV66RKW8W6A@cipher.nrlssc.navy.mil","threadId":"15901","inReplyTo":"7vej2i7rt9.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2008-10-15T15:35:30Z","receivedAt":"2008-10-15T15:35:30Z","isPatch":false,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"\nTwo questions:\n\n 1) Should a5a5a048 be in maint?\n \"xdiff-interface.c: strip newline (and cr) from line before pattern matching\"\n\n 2) Do we want to stick with compat/regex on\n\n Darwin: Arjen\n FreeBSD: Jeff\n AIX: Mike\n\n now that the builtin funcname patterns have been converted to Extended\n Regular Expressions?\n\n-brandon\n"},{"id":"93107","messageId":"e2b179460810151025v684bafd2w8321fc645f5a4e39@mail.gmail.com","threadId":"15901","inReplyTo":"bsftmRx17krWBpVlulipoJEO1fWsD0hZfF3HOZcajX6GV66RKW8W6A@cipher.nrlssc.navy.mil","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Mike Ralphson","fromEmail":"mike.ralphson@gmail.com","sentAt":"2008-10-15T17:25:07Z","receivedAt":"2008-10-15T17:25:07Z","isPatch":false,"sender":{"key":"mike.ralphson@gmail.com","avatar":"https://avatars.githubusercontent.com/u/21603?v=4"},"body":"2008/10/15 Brandon Casey :\n> 2) Do we want to stick with compat/regex on\n>\n> Darwin: Arjen\n> FreeBSD: Jeff\n> AIX: Mike\n>\n> now that the builtin funcname patterns have been converted to Extended\n> Regular Expressions?\n\nThanks for the reminder, I'd been meaning to recheck this. It appears\nthat AIX doesn't require compat/regex now with the eregexes, so:\n\nTested-as-no-longer-required-by: Mike Ralphson \n\nThough I've just noticed my test counts don't actually add up...\n\nfixed 1\nsuccess 3555\nfailed 0\nbroken 1\ntotal 3559\n\n8-)\n\nMike\n"},{"id":"93128","messageId":"7vljwpr6lr.fsf@gitster.siamese.dyndns.org","threadId":"15901","inReplyTo":"bsftmRx17krWBpVlulipoJEO1fWsD0hZfF3HOZcajX6GV66RKW8W6A@cipher.nrlssc.navy.mil","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-15T19:38:56Z","receivedAt":"2008-10-15T19:38:56Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brandon Casey writes:\n\n> Two questions:\n>\n> 1) Should a5a5a048 be in maint?\n> \"xdiff-interface.c: strip newline (and cr) from line before pattern matching\"\n\nI would have forked a maint-fix topic to prepare a merge of this fix to\nboth 'maint' and 'master' but apparently this was applied directly on\n'master'. I may be missing a valid reason why Shawn did it this way.\n\nIf we can add a test case to demonstrate the existing breakage, I think we\ncan (and should) cherry-pick it to 'maint'.\n\n> 2) Do we want to stick with compat/regex on\n>\n> Darwin: Arjen\n> FreeBSD: Jeff\n> AIX: Mike\n>\n> now that the builtin funcname patterns have been converted to Extended\n> Regular Expressions?\n\nMike already said AIX does not need to, and I expect others would say\ntheir native regexp library can grok ERE just fine. Let's wait for others\nto confirm and then remove the compat/regex thing.\n"},{"id":"93136","messageId":"20081015202032.GD28802@spearce.org","threadId":"15901","inReplyTo":"7vljwpr6lr.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-10-15T20:20:32Z","receivedAt":"2008-10-15T20:20:32Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> Brandon Casey writes:\n> \n> > Two questions:\n> >\n> > 1) Should a5a5a048 be in maint?\n> > \"xdiff-interface.c: strip newline (and cr) from line before pattern matching\"\n> \n> I would have forked a maint-fix topic to prepare a merge of this fix to\n> both 'maint' and 'master' but apparently this was applied directly on\n> 'master'. I may be missing a valid reason why Shawn did it this way.\n\nMy fault. I didn't have a reason for putting it on master.\nMy reason really boiled down to \"I can't decide where this goes,\noops, got distracted by something, git checkout master, git am,\nmove on...\".\n\nYes, it probably should have gone to maint. No, it didn't go there.\nTemporary lapse in maintainer judgement.\n \n> If we can add a test case to demonstrate the existing breakage, I think we\n> can (and should) cherry-pick it to 'maint'.\n\nProbably. Sorry for the cherry-pick being required here.\n\n-- \nShawn.\n"},{"id":"93140","messageId":"7vhc7dr4f8.fsf@gitster.siamese.dyndns.org","threadId":"15901","inReplyTo":"20081015202032.GD28802@spearce.org","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-15T20:26:03Z","receivedAt":"2008-10-15T20:26:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n>> If we can add a test case to demonstrate the existing breakage, I think we\n>> can (and should) cherry-pick it to 'maint'.\n>\n> Yes, it probably should have gone to maint. No, it didn't go there.\n> Temporary lapse in maintainer judgement.\n\nThat is Ok. I do the same all the time (and I try to rewind and rebuild\nwhen I spot it before pushing the results out, but I am not always\nsuccessful).\n\nI just wanted to see if there was any particular reason not to have this\non 'maint'.\n\nThanks.\n"},{"id":"93143","messageId":"20081015203601.GE28802@spearce.org","threadId":"15901","inReplyTo":"7vhc7dr4f8.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-10-15T20:36:01Z","receivedAt":"2008-10-15T20:36:01Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> \"Shawn O. Pearce\" writes:\n> \n> >> If we can add a test case to demonstrate the existing breakage, I think we\n> >> can (and should) cherry-pick it to 'maint'.\n> >\n> > Yes, it probably should have gone to maint. No, it didn't go there.\n> > Temporary lapse in maintainer judgement.\n> \n> That is Ok. I do the same all the time (and I try to rewind and rebuild\n> when I spot it before pushing the results out, but I am not always\n> successful).\n\nOh, trust me, I had many times where I had to rebuild everything\nfor that day's push because I forgot about a patch that should\nbe in maint. At least your Meta/RB and Meta/PU scripts make it\nsomewhat painless, that and Git's ability to just hard reset a\nbranch back to what I last published. ;-)\n\nI just utterly failed to do it that morning. Or at least failed\nto do it for this change.\n \n> I just wanted to see if there was any particular reason not to have this\n> on 'maint'.\n\nNope.\n\n-- \nShawn.\n"},{"id":"93160","messageId":"13723998.1224118688113.JavaMail.teamon@b307.teamon.com","threadId":"15901","inReplyTo":"7vljwpr6lr.fsf@gitster.siamese.dyndns.org","subject":"[PATCH maint 1/2] t4018-diff-funcname: rework negated last expression test","fromName":"","fromEmail":"drafnel@gmail.com","sentAt":"2008-10-16T00:58:49Z","receivedAt":"2008-10-16T00:58:49Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"This test used the non-zero exit status of 'git diff' to indicate that a\nnegated funcname pattern, when placed last, was correctly rejected.\n\nThe problem with this is that 'git diff' always returns non-zero if it\nfinds differences in the files it is comparing, and the files must\ncontain differences in order to trigger the funcname pattern codepath.\n\nInstead of checking for non-zero exit status, make sure the expected\nerror message is printed.\n\nSigned-off-by: Brandon Casey \n---\n\n\nThis is not really a series, but I expect you'll apply both, so this\nseems easier for both of us.\n\n-brandon\n\n\n t/t4018-diff-funcname.sh | 3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh\nindex 99fff97..72076ec 100755\n--- a/t/t4018-diff-funcname.sh\n+++ b/t/t4018-diff-funcname.sh\n@@ -65,7 +65,8 @@ test_expect_success 'custom pattern' '\n \n test_expect_success 'last regexp must not be negated' '\n \tgit config diff.java.funcname \"!static\" &&\n-\ttest_must_fail git diff --no-index Beer.java Beer-correct.java\n+\tgit diff --no-index Beer.java Beer-correct.java 2>&1 |\n+\tgrep \"fatal: Last expression must not be negated:\"\n '\n \n test_expect_success 'alternation in pattern' '\n-- \n1.6.0.2.101.gb844\n"},{"id":"93161","messageId":"6078773.1224118690194.JavaMail.teamon@b307.teamon.com","threadId":"15901","inReplyTo":"1224118730-24711-1-git-send-email-drafnel@gmail.com","subject":"[PATCH maint 2/2] t4018-diff-funcname: demonstrate end of line funcname matching flaw","fromName":"","fromEmail":"drafnel@gmail.com","sentAt":"2008-10-16T00:58:50Z","receivedAt":"2008-10-16T00:58:50Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Since the newline is not removed from lines before pattern matching, a\npattern cannot match to the end of the line using the '$' operator without\nusing an additional operator which will indirectly match the '\\n' character.\n\nIntroduce a test which should pass, but which does not due to this flaw.\n\nSigned-off-by: Brandon Casey \n---\n t/t4018-diff-funcname.sh | 6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh\nindex 72076ec..40a805a 100755\n--- a/t/t4018-diff-funcname.sh\n+++ b/t/t4018-diff-funcname.sh\n@@ -69,6 +69,12 @@ test_expect_success 'last regexp must not be negated' '\n \tgrep \"fatal: Last expression must not be negated:\"\n '\n \n+test_expect_failure 'pattern which matches to end of line' '\n+\tgit config diff.java.funcname \"Beer$\" &&\n+\tgit diff --no-index Beer.java Beer-correct.java |\n+\tgrep \"^@@.*@@ Beer\"\n+'\n+\n test_expect_success 'alternation in pattern' '\n \tgit config diff.java.xfuncname \"^[ \t]*((public|static).*)$\" &&\n \tgit diff --no-index Beer.java Beer-correct.java |\n-- \n1.6.0.2.101.gb844\n"},{"id":"93179","messageId":"20081016100805.GA20762@sigill.intra.peff.net","threadId":"15901","inReplyTo":"bsftmRx17krWBpVlulipoJEO1fWsD0hZfF3HOZcajX6GV66RKW8W6A@cipher.nrlssc.navy.mil","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-10-16T10:08:05Z","receivedAt":"2008-10-16T10:08:05Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Oct 15, 2008 at 10:35:30AM -0500, Brandon Casey wrote:\n\n> 2) Do we want to stick with compat/regex on\n> \n> Darwin: Arjen\n> FreeBSD: Jeff\n> AIX: Mike\n> \n> now that the builtin funcname patterns have been converted to Extended\n> Regular Expressions?\n\nt4018 passes without compat/regex on FreeBSD. Is that a sufficient test?\n\n-Peff\n"},{"id":"93209","messageId":"0my5lujnbpdG6sxrffMExwukINu2tasxBSH0E0xYQoe6y5yyFL0LNA@cipher.nrlssc.navy.mil","threadId":"15901","inReplyTo":"20081016100805.GA20762@sigill.intra.peff.net","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2008-10-16T15:21:24Z","receivedAt":"2008-10-16T15:21:24Z","isPatch":false,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Jeff King wrote:\n> On Wed, Oct 15, 2008 at 10:35:30AM -0500, Brandon Casey wrote:\n> \n>> 2) Do we want to stick with compat/regex on\n>>\n>> Darwin: Arjen\n>> FreeBSD: Jeff\n>> AIX: Mike\n>>\n>> now that the builtin funcname patterns have been converted to Extended\n>> Regular Expressions?\n> \n> t4018 passes without compat/regex on FreeBSD. Is that a sufficient test?\n\nI think so. t4018 makes sure all the patterns compile, and includes Arjen's test\nfor appropriate handling of the alternation operator.\n\nDarwin, anyone?\n\n-brandon\n"},{"id":"93213","messageId":"465E8DD6-CBDC-4E02-9C7F-57CBE81E3549@frim.nl","threadId":"15901","inReplyTo":"0my5lujnbpdG6sxrffMExwukINu2tasxBSH0E0xYQoe6y5yyFL0LNA@cipher.nrlssc.navy.mil","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Pieter de Bie","fromEmail":"pieter@frim.nl","sentAt":"2008-10-16T15:37:10Z","receivedAt":"2008-10-16T15:37:10Z","isPatch":false,"sender":{"key":"pieter@frim.nl","avatar":null},"body":"\nOn 16 okt 2008, at 17:21, Brandon Casey wrote:\n\n> Darwin, anyone?\n\n'maint' passes for me on Darwin (OS X Leopard) after removing the \nregex stuff in Makefile\n\n- Pieter\n"},{"id":"93271","messageId":"20081017070245.GA29345@regex.yaph.org","threadId":"15901","inReplyTo":"465E8DD6-CBDC-4E02-9C7F-57CBE81E3549@frim.nl","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Arjen Laarhoven","fromEmail":"arjen@yaph.org","sentAt":"2008-10-17T07:02:45Z","receivedAt":"2008-10-17T07:02:45Z","isPatch":false,"sender":{"key":"arjen@yaph.org","avatar":"https://gravatar.com/avatar/f776c2c0c5ea62d70827b942eb7d95ce85661a3d70bc3f03cf9773815c599c01?d=mp&s=160"},"body":"On Thu, Oct 16, 2008 at 05:37:10PM +0200, Pieter de Bie wrote:\n> \n> On 16 okt 2008, at 17:21, Brandon Casey wrote:\n> \n> >Darwin, anyone?\n> \n> 'maint' passes for me on Darwin (OS X Leopard) after removing the \n> regex stuff in Makefile\n\nYup, confirmed.\n\nArjen\n\n-- \nArjen Laarhoven\n\nThe presence of those seeking the truth is infinitely to be preferred to \nthose who think they've found it.\n -- Terry Pratchett, \"Monstrous Regiment\"\n"},{"id":"93285","messageId":"20081017095357.GA5563@sigill.intra.peff.net","threadId":"15901","inReplyTo":"7vej2i7rt9.fsf@gitster.siamese.dyndns.org","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-10-17T09:53:57Z","receivedAt":"2008-10-17T09:53:57Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 14, 2008 at 03:08:50PM -0700, Junio C Hamano wrote:\n\n> * The 'master' branch has these since the last announcement\n> in addition to the above.\n> \n> Jeff King (1):\n> tests: shell negation portability fix\n\nCan you cherry-pick this into maint? The problem it fixes was caused by\n969c877, which is in maint (IOW, master is fixed, but maint is still\nbroken).\n\n-Peff\n"},{"id":"93320","messageId":"7vmyh2g4fq.fsf@gitster.siamese.dyndns.org","threadId":"15901","inReplyTo":"20081017095357.GA5563@sigill.intra.peff.net","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-17T23:58:01Z","receivedAt":"2008-10-17T23:58:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Tue, Oct 14, 2008 at 03:08:50PM -0700, Junio C Hamano wrote:\n>\n>> * The 'master' branch has these since the last announcement\n>> in addition to the above.\n>> \n>> Jeff King (1):\n>> tests: shell negation portability fix\n>\n> Can you cherry-pick this into maint? The problem it fixes was caused by\n> 969c877, which is in maint (IOW, master is fixed, but maint is still\n> broken).\n\nThanks, will do.\n"},{"id":"93815","messageId":"7vod1a3e5w.fsf@gitster.siamese.dyndns.org","threadId":"15901","inReplyTo":"bsftmRx17krWBpVlulipoJEO1fWsD0hZfF3HOZcajX6GV66RKW8W6A@cipher.nrlssc.navy.mil","subject":"Re: What's in git.git (Oct 2008, #03; Tue, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-10-24T02:44:27Z","receivedAt":"2008-10-24T02:44:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brandon Casey writes:\n\n> 2) Do we want to stick with compat/regex on\n>\n> Darwin: Arjen\n> FreeBSD: Jeff\n> AIX: Mike\n>\n> now that the builtin funcname patterns have been converted to Extended\n> Regular Expressions?\n\n-- >8 --\nSubject: Stop using compat/regex.c on platforms with working regexp library\n\nWe used to have non-POSIX comformant BRE in our code, and linked with GNU\nregexp library on a few platforms (Darwin, FreeBSD and AIX) to work it\naround. This was backwards.\n\nWe've fixed the broken regexps to use ERE that native regexp libraries on\nthese platforms can handle just fine. There is no need to link with GNU\nregexp library on these platforms anymore.\n\nTested-on-AIX-by: Mike Ralphson \nTested-on-FreeBSD-by: Jeff King \nTested-on-Darwin-by: Arjen Laarhoven \nTested-on-Darwin-by: Pieter de Bie \nSigned-off-by: Junio C Hamano \n---\n Makefile | 6 ------\n 1 files changed, 0 insertions(+), 6 deletions(-)\n\ndiff --git c/Makefile w/Makefile\nindex d6f3695..40309e1 100644\n--- c/Makefile\n+++ w/Makefile\n@@ -640,8 +640,6 @@ ifeq ($(uname_S),Darwin)\n \tendif\n \tNO_STRLCPY = YesPlease\n \tNO_MEMMEM = YesPlease\n-\tCOMPAT_CFLAGS += -Icompat/regex\n-\tCOMPAT_OBJS += compat/regex/regex.o\n endif\n ifeq ($(uname_S),SunOS)\n \tNEEDS_SOCKET = YesPlease\n@@ -692,8 +690,6 @@ ifeq ($(uname_S),FreeBSD)\n \tBASIC_LDFLAGS += -L/usr/local/lib\n \tDIR_HAS_BSD_GROUP_SEMANTICS = YesPlease\n \tTHREADED_DELTA_SEARCH = YesPlease\n-\tCOMPAT_CFLAGS += -Icompat/regex\n-\tCOMPAT_OBJS += compat/regex/regex.o\n endif\n ifeq ($(uname_S),OpenBSD)\n \tNO_STRCASESTR = YesPlease\n@@ -720,8 +716,6 @@ ifeq ($(uname_S),AIX)\n \tINTERNAL_QSORT = UnfortunatelyYes\n \tNEEDS_LIBICONV=YesPlease\n \tBASIC_CFLAGS += -D_LARGE_FILES\n-\tCOMPAT_CFLAGS += -Icompat/regex\n-\tCOMPAT_OBJS += compat/regex/regex.o\n endif\n ifeq ($(uname_S),GNU)\n \t# GNU/Hurd\n"}]}