From 60cc20b03365d02a45a2ce98a37fe7114173fe15 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 26 Nov 2015 17:07:27 +0300
Subject: [PATCH] GitUtil.findGitDir: resolve symlinks when searching for
 submodule repo dir

---
 plugins/git4idea/src/git4idea/GitUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java
index cf0991d3e97c..523ed36dacc4 100644
--- a/plugins/git4idea/src/git4idea/GitUtil.java
+++ b/plugins/git4idea/src/git4idea/GitUtil.java
@@ -115,7 +115,7 @@ public class GitUtil {
   @Nullable
   private static File findSubmoduleRepositoryDir(@NotNull VirtualFile rootDir, @NotNull String path) {
     if (!FileUtil.isAbsolute(path)) {
-      String canonicalPath = FileUtil.toCanonicalPath(FileUtil.join(rootDir.getPath(), path));
+      String canonicalPath = FileUtil.toCanonicalPath(FileUtil.join(rootDir.getPath(), path), true);
       if (canonicalPath == null) {
         return null;
       }