diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /plugins/git4idea/src/git4idea/GitUtil.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/git4idea/src/git4idea/GitUtil.java')
| -rw-r--r-- | plugins/git4idea/src/git4idea/GitUtil.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java index 4ff61fb4a68b..e96d52de8ea0 100644 --- a/plugins/git4idea/src/git4idea/GitUtil.java +++ b/plugins/git4idea/src/git4idea/GitUtil.java @@ -102,7 +102,6 @@ public class GitUtil { public static final String DOT_GIT = ".git"; private final static Logger LOG = Logger.getInstance(GitUtil.class); - private static final int SHORT_HASH_LENGTH = 8; public static final Predicate<GitBranchTrackInfo> NOT_NULL_PREDICATE = new Predicate<GitBranchTrackInfo>() { @Override @@ -829,17 +828,6 @@ public class GitUtil { } @NotNull - public static String getShortHash(@NotNull String hash) { - if (hash.length() == 0) return ""; - if (hash.length() == 40) return hash.substring(0, SHORT_HASH_LENGTH); - if (hash.length() > 40) // revision string encoded with date too - { - return hash.substring(hash.indexOf("[") + 1, SHORT_HASH_LENGTH); - } - return hash; - } - - @NotNull public static String fileOrFolder(@NotNull VirtualFile file) { if (file.isDirectory()) { return "Folder"; |