diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperationsProcessor.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperationsProcessor.java index 03aefdeee6a5..c8c354d1738f 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchOperationsProcessor.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperationsProcessor.java @@ -405,7 +405,7 @@ public final class GitBranchOperationsProcessor { @NotNull private static Collection loadTotalDiff(@NotNull GitRepository repository, @NotNull String branchName) { try { - return GitChangeUtils.getDiff(repository.getProject(), repository.getRoot(), null, branchName, null); + return GitChangeUtils.getDiff(repository.getProject(), repository.getRoot(), "HEAD", branchName, null); } catch (VcsException e) { // we treat it as critical and report an error diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java index c0080c347893..ac54cdad14c1 100644 --- a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java +++ b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java @@ -419,7 +419,7 @@ public class GitChangeUtils { String range = firstRevision == null ? nextRevision : firstRevision + ".." + nextRevision; String output = getDiffOutput(project, root, range, dirtyPaths); GitRevisionNumber thisRevision = firstRevision == null ? null : loadRevision(project, root, firstRevision); - parseChanges(project, root, thisRevision, loadRevision(project, root, nextRevision), output, changes, Collections.emptySet()); + parseChanges(project, root, loadRevision(project, root, nextRevision), thisRevision, output, changes, Collections.emptySet()); return changes; }