summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2014-01-21 23:16:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-22 16:06:19 (GMT)
commit2000544330d5b047074d8043042f7cc66157f8f5 (patch)
tree3b0f7c57cf8712c7db4f6fd051ccce1554186d3e
parent79467e61aa30342d7fb17232624ec5ade4cbbe6a (diff)
downloadgit-2000544330d5b047074d8043042f7cc66157f8f5.zip
git-2000544330d5b047074d8043042f7cc66157f8f5.tar.gz
git-2000544330d5b047074d8043042f7cc66157f8f5.tar.bz2
git p4: fix an error message when "p4 where" fails
When "p4 where" fails, for whatever reason, the error message tries to show an undefined variable. This minor bug applies only when using a client spec, and was introduced recently in 9d57c4a (git p4: implement view spec wildcards with "p4 where", 2013-08-30). Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 26b874f..cdfa2df 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1871,7 +1871,7 @@ class View(object):
# assume error is "... file(s) not in client view"
continue
if "clientFile" not in res:
- die("No clientFile from 'p4 where %s'" % depot_path)
+ die("No clientFile in 'p4 where' output")
if "unmap" in res:
# it will list all of them, but only one not unmap-ped
continue