diff options
| author |  Daniel Barkalow <barkalow@iabervon.org> | 2008-07-22 12:48:57 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-23 11:33:34 -0700 |
| commit | 2d71bde2d1a8f4e1c06cb8049a794ba4ba35d37d (patch) | |
| tree | ac8b49434d209e705ab245ec691e7b65b6f25a82 /contrib/fast-import | |
| parent | Allow pager of diff command be enabled/disabled (diff) | |
| download | tgif-2d71bde2d1a8f4e1c06cb8049a794ba4ba35d37d.tar.xz | |
In perforce, RCS keywords are case-sensitive
At least, this is true in 2007.2, according to the documentation.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
| -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 87ca51e401..6ae0429c2d 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -906,7 +906,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'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text) + text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text) contents[stat['depotFile']] = text |