From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Nov 2008 21:18:25 +0000 (-0800)
Subject: Merge branch 'pw/maint-p4' into maint
X-Git-Tag: v1.6.1-rc1~15^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b21a226a42d609d4d39522e27423e8323f0db71d?hp=a0178ae2cfd79a1da5d7ddfacadb1e41560bb464

Merge branch 'pw/maint-p4' into maint

* pw/maint-p4:
git-p4: fix keyword-expansion regex
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 46136d49bf..2b122d3f51 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -963,7 +963,7 @@ class P4Sync(Command):
             if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
                 text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text)
             elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
-                text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text)
+                text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$\n]*\$',r'$\1$', text)
 
             contents[stat['depotFile']] = text