java - 使用 JGit 获取更改文件列表

Question

我想知道如何在 pull 请求后检索已更改文件的列表。

我正在使用它来获取所有 merge 的提交，但我想知道所有已更改的文件。

Git git = new Git(localRepo);
PullCommand pullCmd = git.pull();
PullResult pullResult = pullCmd.call();
MergeResult mergeResult = pullResult.getMergeResult();
ObjectId[] mergedCommits = mergeResult.getMergedCommits();

for (ObjectId mergedCommit : mergedCommits) {
  // And now?
}

Answer 1

基于之前的评论/问题:

在 pull 之前获取当前头部:

ObjectId oldHead = repository.resolve("HEAD^{tree}");

之后再次 pull :

ObjectId head = repository.resolve("HEAD^{tree}");

那么你应该能够以与 How do I do the equivalent of "git diff --name-status" with jgit? 中相同的方式运行差异:

ObjectReader reader = repository.newObjectReader();
CanonicalTreeParser oldTreeIter = new CanonicalTreeParser();
oldTreeIter.reset(reader, oldHead);
CanonicalTreeParser newTreeIter = new CanonicalTreeParser();
newTreeIter.reset(reader, head);
List<DiffEntry> diffs= git.diff()
                    .setNewTree(newTreeIter)
                    .setOldTree(oldTreeIter)
                    .call();