| commit | cb585a9cda70320647cc5d69e71bedc929244189 | |
| author | Pete Wyckoff <pw@padd.com> | |
| Sun, 16 Oct 2011 14:46:52 +0000 (16 10:46 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 03:46:49 +0000 (17 20:46 -0700) | ||
| tree | 2afb56758290b5ee2cbe9738adc21c1ebc669222 | treesnapshot (tar.gz zip) |
| parent | 97a21ca50ef893a171a50c863fe21a924935fd2a | commitdiff |
git-p4: keyword flattening fixes
Join the text before looking for keywords. There is nothing to
prevent the p4 output marshaller from splitting in the middle of a
keyword, although it has never been known to happen.
Also remove the (?i) regexp modifier; perforce keywords are
documented as case-sensitive.
Remove the "\n" end-character match. I don't know why that is
in there, and every keyword in a fairly large production p4 repository
always ends with a $.
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Join the text before looking for keywords. There is nothing to
prevent the p4 output marshaller from splitting in the middle of a
keyword, although it has never been known to happen.
Also remove the (?i) regexp modifier; perforce keywords are
documented as case-sensitive.
Remove the "\n" end-character match. I don't know why that is
in there, and every keyword in a fairly large production p4 repository
always ends with a $.
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/fast-import/git-p4 | diffblobblamehistory |