mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'pw/maint-p4' into maint
* pw/maint-p4: git-p4: fix keyword-expansion regex
This commit is contained in:
commit
b21a226a42
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue