diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-01-20 02:04:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-01-20 02:04:46 +0300 |
commit | ed87d37eaae64ea1eaf585ddba311b3d763e4df8 (patch) | |
tree | 88cb654547768bf15ea69da8f3e297a2cb82b969 | |
parent | 1b095626937a858e3a68e9c7d1de11b71117bb42 (diff) | |
parent | 02b5c1a94698a14b6df71a9e8d38b75169787fa3 (diff) |
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
-rwxr-xr-x | git-p4.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -4251,7 +4251,8 @@ class P4Sync(Command, P4UserMap): if self.tempBranches != []: for branch in self.tempBranches: read_pipe(["git", "update-ref", "-d", branch]) - os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation)) + if len(read_pipe(["git", "for-each-ref", self.tempBranchLocation])) > 0: + die("There are unexpected temporary branches") # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow # a convenient shortcut refname "p4". |