From 975fb129da0979ec6a98dcd3d60947ab042fc426 Mon Sep 17 00:00:00 2001 From: "Nikolay.Rykunov" Date: Thu, 21 Feb 2019 12:48:27 +0300 Subject: [PATCH] Update new util method: add support of preserverOrder --- plugins/git4idea/src/git4idea/history/GitLogUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/GitLogUtil.java b/plugins/git4idea/src/git4idea/history/GitLogUtil.java index b08038f82743..eb46e6868b01 100644 --- a/plugins/git4idea/src/git4idea/history/GitLogUtil.java +++ b/plugins/git4idea/src/git4idea/history/GitLogUtil.java @@ -376,7 +376,7 @@ public class GitLogUtil { boolean includeRootChanges, boolean lowPriorityProcess, @NotNull DiffRenameLimit renameLimit) throws VcsException { - readFullDetailsForHashes(project, root, vcs, commitConsumer, hashes, includeRootChanges, lowPriorityProcess, true, renameLimit); + readFullDetailsForHashes(project, root, vcs, commitConsumer, hashes, includeRootChanges, lowPriorityProcess, true, false, renameLimit); } public static void readFullDetailsForHashes(@NotNull Project project, @@ -387,12 +387,13 @@ public class GitLogUtil { boolean includeRootChanges, boolean lowPriorityProcess, boolean withFullMergeDiff, + boolean preserverOrder, @NotNull DiffRenameLimit renameLimit) throws VcsException { GitLineHandler handler = createGitHandler(project, root, createConfigParameters(true, includeRootChanges, renameLimit), lowPriorityProcess); sendHashesToStdin(vcs, hashes, handler); - readFullDetailsFromHandler(project, root, commitConsumer, renameLimit, handler, false, withFullMergeDiff, + readFullDetailsFromHandler(project, root, commitConsumer, renameLimit, handler, preserverOrder, withFullMergeDiff, getNoWalkParameter(vcs), STDIN); }