Skip to content

Commit 2000544

Browse files
Pete Wyckoffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 79467e6 commit 2000544

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1871,7 +1871,7 @@ def update_client_spec_path_cache(self, files):
18711871
# assume error is "... file(s) not in client view"
18721872
continue
18731873
if "clientFile" not in res:
1874-
die("No clientFile from 'p4 where %s'" % depot_path)
1874+
die("No clientFile in 'p4 where' output")
18751875
if "unmap" in res:
18761876
# it will list all of them, but only one not unmap-ped
18771877
continue

0 commit comments

Comments
 (0)