From: Moritz Baumann <moritz.baumann@xxxxxxx> The error handling code referenced a variable that does not exist. Also, the condition could never evaluate to True. Signed-off-by: Moritz Baumann <moritz.baumann@xxxxxxx> --- git-p4.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/git-p4.py b/git-p4.py index 1de3d6f1cd4..8f20d15f272 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 -- gitgitgadget