{"thread":{"id":"16480","subject":"[PATCH] git-p4: fix keyword-expansion regex","startedAt":"2008-11-26T18:52:15Z","lastAt":"2008-11-28T22:29:27Z","messageCount":4,"participants":["Pete Wyckoff","Junio C Hamano","Simon Hausmann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"96569","messageId":"20081126185215.GA11037@osc.edu","threadId":"16480","inReplyTo":null,"subject":"[PATCH] git-p4: fix keyword-expansion regex","fromName":"Pete Wyckoff","fromEmail":"pw@padd.com","sentAt":"2008-11-26T18:52:15Z","receivedAt":"2008-11-26T18:52:15Z","isPatch":true,"sender":{"key":"pw@padd.com","avatar":null},"body":"This text:\n\n     my $dir = $File::Find::dir;\n     return if ($dir !~ m,$options->{dirpat}$,);\n\nwas improperly converted to:\n\n     my $dir = $File$dir !~ m,$options->{dirpat}$,);\n\nby the keyword identifier expansion code.  Add a \\n\nto make sure the regex doesn't go across end-of-line\nboundaries.\n\nSigned-off-by: Pete Wyckoff <pw@padd.com>\n---\n contrib/fast-import/git-p4 |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4\nindex 9b04ca5..09317af 100755\n--- a/contrib/fast-import/git-p4\n+++ b/contrib/fast-import/git-p4\n@@ -1005,7 +1005,7 @@ class P4Sync(Command):\n             if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):\n                 text = re.sub(r'(?i)\\$(Id|Header):[^$]*\\$',r'$\\1$', text)\n             elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):\n-                text = re.sub(r'\\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\\$',r'$\\1$', text)\n+                text = re.sub(r'\\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$\\n]*\\$',r'$\\1$', text)\n \n             contents[stat['depotFile']] = text\n \n-- \n1.5.6.5\n"},{"id":"96575","messageId":"7vljv6fcr0.fsf@gitster.siamese.dyndns.org","threadId":"16480","inReplyTo":"20081126185215.GA11037@osc.edu","subject":"Re: [PATCH] git-p4: fix keyword-expansion regex","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-26T20:33:55Z","receivedAt":"2008-11-26T20:33:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I will queue this to 'pu' and wait for an Ack from git-p4 folks.   Thanks.\n"},{"id":"96626","messageId":"200811271745.30963.simon@lst.de","threadId":"16480","inReplyTo":"7vljv6fcr0.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] git-p4: fix keyword-expansion regex","fromName":"Simon Hausmann","fromEmail":"simon@lst.de","sentAt":"2008-11-27T16:45:30Z","receivedAt":"2008-11-27T16:45:30Z","isPatch":true,"sender":{"key":"hausmann@kde.org","avatar":"https://gravatar.com/avatar/bc9aad4fb31dce17eb66e690e7b51fe980c62da3c225c785da35dd806b8da778?d=mp&s=160"},"body":"On Wednesday 26 November 2008 Junio C Hamano, wrote:\n> I will queue this to 'pu' and wait for an Ack from git-p4 folks.   Thanks.\n\nAcked-by: Simon Hausmann <simon@lst.de>\n\n\n\nSimon\n"},{"id":"96698","messageId":"7vy6z37ad4.fsf@gitster.siamese.dyndns.org","threadId":"16480","inReplyTo":"200811271745.30963.simon@lst.de","subject":"Re: [PATCH] git-p4: fix keyword-expansion regex","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-28T22:29:27Z","receivedAt":"2008-11-28T22:29:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Simon Hausmann <simon@lst.de> writes:\n\n> On Wednesday 26 November 2008 Junio C Hamano, wrote:\n>> I will queue this to 'pu' and wait for an Ack from git-p4 folks.   Thanks.\n>\n> Acked-by: Simon Hausmann <simon@lst.de>\n\nThanks.\n"}]}