From 198551ca54f6ff1c95c9357ccca9ae37298811bf Mon Sep 17 00:00:00 2001 From: Moritz Baumann Date: Wed, 20 Jul 2022 18:55:30 +0000 Subject: [PATCH] git-p4: fix error handling in P4Unshelve.renameBranch() The error handling code path is meant to be triggered when the loop does not exit early via "break". This fails, as the boolean variable "found", which is used to track whether the loop was exited early, is initialized incorrectly. It would be possible to fix this issue by correcting the initialization, but Python supports a for:-else: control flow construct for this exact use case (executing code if a loop does not exit early), so it is more idiomatic to remove the tracking variable entirely. In addition, the error message no longer refers to a variable that does not exist. Signed-off-by: Moritz Baumann Signed-off-by: Junio C Hamano --- git-p4.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/git-p4.py b/git-p4.py index 1de3d6f1cd..8f20d15f27 100755 --- a/git-p4.py +++ b/git-p4.py @@ -4369,19 +4369,16 @@ class P4Unshelve(Command): def renameBranch(self, branch_name): """Rename the existing branch to branch_name.N .""" - found = True for i in range(0, 1000): backup_branch_name = "{0}.{1}".format(branch_name, i) if not gitBranchExists(backup_branch_name): # Copy ref to backup gitUpdateRef(backup_branch_name, branch_name) gitDeleteRef(branch_name) - found = True print("renamed old unshelve branch to {0}".format(backup_branch_name)) break - - if not found: - sys.exit("gave up trying to rename existing branch {0}".format(sync.branch)) + else: + sys.exit("gave up trying to rename existing branch {0}".format(branch_name)) def findLastP4Revision(self, starting_point): """Look back from starting_point for the first commit created by git-p4