From 2000544330d5b047074d8043042f7cc66157f8f5 Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Tue, 21 Jan 2014 18:16:46 -0500 Subject: 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 Signed-off-by: Junio C Hamano 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 -- cgit v0.10.2-6-g49f6