"git merge-base --fork-point branchA branchB" 的 jgit 等效方法是什么？

Question

“git merge-base --fork-point branchA branchB”的jgit等效代码是什么？

我尝试了下面的代码，但没有得到正确的答案。我正在使用这个来查找分支源。foreach.branch (git merge-base --fork-point mybranch theirbranch)只会为起点提供一个空的提交ID。

因此，我所需要做的就是找出如何在jgit中执行此操作，这样我就有了一种计算分支源的方法，即使我不知道它在哪里。

private String getMergeBase(Repository repository, ObjectId commitIdA, ObjectId commitIdB) {
    RevWalk walk = new RevWalk(repository)
    try {
        RevCommit revA = walk.lookupCommit(commitIdA)
        RevCommit revB = walk.lookupCommit(commitIdB)

        walk.setRevFilter(RevFilter.MERGE_BASE)
        walk.markStart([revA,revB])
        RevCommit mergeBase = walk.next()
        if (! mergeBase) { return null }
        return mergeBase.name
    } catch(Exception e) {
        project.logger.error("GetMergeBase Failed: ${commitIdA}, ${commitIdB} because ${e.message}")
    }
    return null
}

- Petra Kahn

Answer 1

这里有一种解决方法。注意，我使用的是Gradle/Groovy语言，所以代码可能看起来有些奇怪。

• 获取所有分支
• 对于每个分支，获取合并基础提交 - 因为所有分支都来自主分支，所以都会找到一个
• 遍历提交并在合并基础列表中找到第一个停止

`

/**
 * Obtain GitWorkingCopyLog for all changes on branch with (svn --stop-on-copy equivalent) 
 * @param repoDir
 * @return GitWorkingCopyLog
   */
private GitWorkingCopyLog getLogs(File repoDir) {
  List<RevCommit> commits = []
  Git git = openExistingRepository(repoDir)

  ObjectId head = getHead(git.repository)  // tip of current branch

  // find common merge ancestor branch points for all branches
  List<String> forkCandidates = mergeBaseForAllBranches(git, head)

  for (RevCommit r in git.log().call()) {
    if (r.name in forkCandidates) {
      break // stop looping on first rev in common merge base
    }
    commits.add(r)
  }
  return new GitWorkingCopyLog(git.repository, commits)
}

/**
 * Generate list of commit ids for merge base with all candidates.  All branches come from master
 * so all branches share a common point of origin even if unrelated.
 * @param git jgit controller
 * @param head head revision for target branch
 * @return list of commit ids
 */
private ArrayList mergeBaseForAllBranches(Git git, ObjectId head) {
  def baseCandidates = []
  getBranches(git).each { Ref other ->
    if (other.objectId != head) {
      String base = getMergeBase(git.repository, head, other.objectId)
      baseCandidates.add(base)
    }
  }
  baseCandidates
}

/**
 *
 * @param repository
 * @param commitIdA
 * @param commitIdB
 * @return divergence point between the two branches (even if seemingly unrelated all must come back to master)
 */
private String getMergeBase(Repository repository, ObjectId commitIdA, ObjectId commitIdB) {
  RevWalk walk = new RevWalk(repository)
  try {
    RevCommit revA = walk.lookupCommit(commitIdA)
    RevCommit revB = walk.lookupCommit(commitIdB)

    walk.setRevFilter(RevFilter.MERGE_BASE)


    walk.markStart(revA)
    walk.markStart(revB)
    RevCommit mergeBase = walk.next()
    println "\tA: ${revA.name}\n\tB: ${revB.name}\n\tM: ${mergeBase.name}"
    if (! mergeBase) { return null }
    return mergeBase.name
  } catch(Exception e) {
    project.logger.error("GetMergeBase Failed: ${commitIdA}, ${commitIdB} because ${e.message}")
  }
  return null
}

/**
 * Get Refs for all branches
 * @param git
 * @return Ref list
 */
private List<Ref> getBranches(Git git) {
  List<Ref> branchRefs = git.branchList().call()
  return branchRefs
}    `

- Petra Kahn

---

实际上，这并不适用于所有情况。我决定放弃并使用标签代替。我只需要这个补丁分支。所有的补丁分支都有类似特定发布标签的名称。我将补丁分支名称转换为标签名称，然后使用log tag..HEAD来查找我想要的更改。 - Petra Kahn