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>
This commit is contained in:

committed by
Junio C Hamano

parent
0cf1b72a38
commit
79467e61aa
@ -310,8 +310,8 @@ def split_p4_type(p4type):
|
||||
#
|
||||
# return the raw p4 type of a file (text, text+ko, etc)
|
||||
#
|
||||
def p4_type(file):
|
||||
results = p4CmdList(["fstat", "-T", "headType", file])
|
||||
def p4_type(f):
|
||||
results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
|
||||
return results[0]['headType']
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user