[git] IDEA-78347 Use --full-history --simplify-merges for file history

This will solve the issue of hiding commit+its revert from Git,
but will avoid showing unrelated merges.
This commit is contained in:
Kirill Likhodedov
2015-02-20 13:28:18 +03:00
parent fd41ee9a7d
commit 3afd399272
@@ -355,7 +355,7 @@ public class GitHistoryUtils {
private static GitLineHandler getLogHandler(Project project, VirtualFile root, GitLogParser parser, FilePath path, String lastCommit, String... parameters) {
final GitLineHandler h = new GitLineHandler(project, root, GitCommand.LOG);
h.setStdoutSuppressed(true);
h.addParameters("--name-status", parser.getPretty(), "--encoding=UTF-8", lastCommit);
h.addParameters("--name-status", parser.getPretty(), "--encoding=UTF-8", "--full-history", "--simplify-merges", lastCommit);
if (parameters != null && parameters.length > 0) {
h.addParameters(parameters);
}