Skip to content

Commit ed87d37

Browse files
committed
Merge branch 'ps/p4-use-ref-api'
"git p4" update to prepare for reftable * ps/p4-use-ref-api: git-p4: stop reaching into the refdb
2 parents 1b09562 + 02b5c1a commit ed87d37

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-p4.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4251,7 +4251,8 @@ def run(self, args):
42514251
if self.tempBranches != []:
42524252
for branch in self.tempBranches:
42534253
read_pipe(["git", "update-ref", "-d", branch])
4254-
os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
4254+
if len(read_pipe(["git", "for-each-ref", self.tempBranchLocation])) > 0:
4255+
die("There are unexpected temporary branches")
42554256

42564257
# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
42574258
# a convenient shortcut refname "p4".

0 commit comments

Comments
 (0)