diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 13:18:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 13:18:25 -0800 |
| commit | b21a226a42d609d4d39522e27423e8323f0db71d (patch) | |
| tree | 2ddefc838193c9ac4533e392aeec1998ff81fbb3 /contrib | |
| parent | a0178ae2cfd79a1da5d7ddfacadb1e41560bb464 (diff) | |
| parent | 3d51c853df5730212f704a526340a5a059dffeda (diff) | |
| download | git-b21a226a42d609d4d39522e27423e8323f0db71d.tar.gz | |
Merge branch 'pw/maint-p4' into maint
* pw/maint-p4:
git-p4: fix keyword-expansion regex
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |