From: "Moritz Baumann via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Luke Diamand <luke@diamand.org>,
Moritz Baumann <moritz.baumann@sap.com>,
Moritz Baumann <moritz.baumann@sap.com>
Subject: [PATCH 2/2] git-p4: fix error handling in P4Unshelve.renameBranch()
Date: Wed, 20 Jul 2022 06:34:59 +0000 [thread overview]
Message-ID: <69c9fd5fbec859c2cced95930ac4d427a09aee90.1658298900.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1297.git.git.1658298900.gitgitgadget@gmail.com>
From: Moritz Baumann <moritz.baumann@sap.com>
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@sap.com>
---
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
next prev parent reply other threads:[~2022-07-20 6:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 6:34 [PATCH 0/2] git-p4: fix two undefined variables Moritz Baumann via GitGitGadget
2022-07-20 6:34 ` [PATCH 1/2] git-p4: fix typo in P4Submit.applyCommit() Moritz Baumann via GitGitGadget
2022-07-20 16:09 ` Junio C Hamano
2022-07-20 6:34 ` Moritz Baumann via GitGitGadget [this message]
2022-07-20 16:18 ` [PATCH 2/2] git-p4: fix error handling in P4Unshelve.renameBranch() Junio C Hamano
2022-07-20 16:21 ` Junio C Hamano
2022-07-20 17:01 ` Baumann, Moritz
2022-07-20 18:55 ` [PATCH v2 0/2] git-p4: fix two undefined variables Moritz Baumann via GitGitGadget
2022-07-20 18:55 ` [PATCH v2 1/2] git-p4: fix typo in P4Submit.applyCommit() Moritz Baumann via GitGitGadget
2022-07-20 18:55 ` [PATCH v2 2/2] git-p4: fix error handling in P4Unshelve.renameBranch() Moritz Baumann via GitGitGadget
2022-07-20 20:54 ` [PATCH v2 0/2] git-p4: fix two undefined variables Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=69c9fd5fbec859c2cced95930ac4d427a09aee90.1658298900.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
--cc=moritz.baumann@sap.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.