summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2014-01-21 18:16:45 -0500
committerJunio C Hamano <gitster@pobox.com>2014-01-22 08:06:19 -0800
commit79467e61aa30342d7fb17232624ec5ade4cbbe6a (patch)
tree44913add825355bf24771ea0c0baf50d47ea9e4e /git-p4.py
parent0cf1b72a38e6190a7e614bbc53fbb81704a3d4af (diff)
downloadgit-79467e61aa30342d7fb17232624ec5ade4cbbe6a.tar.gz
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 'git-p4.py')
-rwxr-xr-xgit-p4.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-p4.py b/git-p4.py
index a4414b58b9..26b874fec9 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -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']
#