Merge branch 'kf/p4-multiple-remotes' into seen

gitster · gitster · commit 75b7cb6020d1 · 2022-04-04T11:00:28.000-07:00
* kf/p4-multiple-remotes:
  git-p4: fix issue with multiple perforce remotes
diff --git a/git-p4.py b/git-p4.py
@@ -1051,8 +1051,12 @@ def findUpstreamBranchPoint(head="HEAD"):
         log = extractLogMessageFromGitCommit(tip)
         settings = extractSettingsGitLog(log)
         if "depot-paths" in settings:
+            git_branch = "remotes/p4/" + branch
             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
     parent = 0
@@ -1062,6 +1066,10 @@ def findUpstreamBranchPoint(head="HEAD"):
         settings = extractSettingsGitLog(log)
         if "depot-paths" in settings:
             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:
                 return [branchByDepotPath[paths], settings]
 
