kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kf/p4-multiple-remotes' 

"git p4" update.

* kf/p4-multiple-remotes:
  git-p4: fix issue with multiple perforce remotes
maint
Junio C Hamano 2022-05-20 15:26:55 -07:00
parent af3a3205d1 944db25c60
commit 586f23705c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-p4.py
View File

@ -1080,8 +1080,12 @@ def findUpstreamBranchPoint(head="HEAD"):
log = extractLogMessageFromGitCommit(tip) log = extractLogMessageFromGitCommit(tip)
settings = extractSettingsGitLog(log) settings = extractSettingsGitLog(log)
if "depot-paths" in settings: if "depot-paths" in settings:
git_branch = "remotes/p4/" + branch
paths = ",".join(settings["depot-paths"]) paths = ",".join(settings["depot-paths"])
branchByDepotPath[paths] = "remotes/p4/" + branch branchByDepotPath[paths] = git_branch
if "change" in settings:
paths = paths + ";" + settings["change"]
branchByDepotPath[paths] = git_branch


settings = None settings = None
parent = 0 parent = 0
@ -1091,6 +1095,10 @@ def findUpstreamBranchPoint(head="HEAD"):
settings = extractSettingsGitLog(log) settings = extractSettingsGitLog(log)
if "depot-paths" in settings: if "depot-paths" in settings:
paths = ",".join(settings["depot-paths"]) paths = ",".join(settings["depot-paths"])
if "change" in settings:
expaths = paths + ";" + settings["change"]
if expaths in branchByDepotPath:
return [branchByDepotPath[expaths], settings]
if paths in branchByDepotPath: if paths in branchByDepotPath:
return [branchByDepotPath[paths], settings] return [branchByDepotPath[paths], settings]