diff options
| author |  Pete Wyckoff <pw@padd.com> | 2014-01-21 18:16:45 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-22 08:06:19 -0800 |
| commit | 79467e61aa30342d7fb17232624ec5ade4cbbe6a (patch) | |
| tree | 44913add825355bf24771ea0c0baf50d47ea9e4e /builtin/merge.c | |
| parent | git p4 test: do not pollute /tmp (diff) | |
| download | tgif-79467e61aa30342d7fb17232624ec5ade4cbbe6a.tar.xz | |
git p4: handle files with wildcards when doing RCS scrubbing
Commit 9d7d446 (git p4: submit files with wildcards, 2012-04-29)
fixed problems with handling files that had p4 wildcard
characters, like "@" and "*". But it missed one case, that of
RCS keyword scrubbing, which uses "p4 fstat" to extract type
information. Fix it by calling wildcard_encode() on the raw
filename.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions