From 0141094bda2fc5ebcc94b4ddab96b1aeb75cd4fb Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 29 Jan 2019 16:54:01 +0300 Subject: [PATCH] git: don't detect renames when calculating for local changes --- plugins/git4idea/src/git4idea/GitUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java index 5062d84973e3..1a075f654667 100644 --- a/plugins/git4idea/src/git4idea/GitUtil.java +++ b/plugins/git4idea/src/git4idea/GitUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package git4idea; import com.intellij.dvcs.DvcsUtil; @@ -809,6 +809,7 @@ public class GitUtil { public static boolean hasLocalChanges(boolean staged, Project project, VirtualFile root) throws VcsException { GitLineHandler diff = new GitLineHandler(project, root, GitCommand.DIFF); diff.addParameters("--name-only"); + diff.addParameters("--no-renames"); if (staged) { diff.addParameters("--cached"); }