From 608a48431ba4e16d0d2efbabe1e8953c5e70ad4c Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 2 Apr 2016 19:17:23 +0300 Subject: [PATCH] git: let GitReference.compareTo conform equals() Actually, GitReference objects shouldn't be comparable at all, but their comparability is already used in many places, and will be changed separately. --- plugins/git4idea/src/git4idea/GitReference.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/GitReference.java b/plugins/git4idea/src/git4idea/GitReference.java index 8af42a3aa559..7e2ee053aa30 100644 --- a/plugins/git4idea/src/git4idea/GitReference.java +++ b/plugins/git4idea/src/git4idea/GitReference.java @@ -15,6 +15,8 @@ */ package git4idea; +import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.text.FilePathHashingStrategy; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; @@ -66,6 +68,6 @@ public abstract class GitReference implements Comparable { } public int compareTo(GitReference o) { - return o == null ? 1 : getFullName().compareTo(o.getFullName()); + return o == null ? 1 : StringUtil.compare(getFullName(), o.getFullName(), SystemInfo.isFileSystemCaseSensitive); } }