Add git worktree feature

https://git-scm.com/docs/git-worktree

Author: pmiossec

GitCommands/Git/GitModule.cs

@@ -1341,7 +1341,7 @@ public string FindGitSuperprojectPath(out string submoduleName, out string submo
                 }
             }
 
-            if (!string.IsNullOrEmpty(superprojectPath))
+            if (!string.IsNullOrEmpty(superprojectPath) && currentPath.StartsWith(superprojectPath))
             {
                 submodulePath = currentPath.Substring(superprojectPath.Length).ToPosixPath();
                 var configFile = new ConfigFile(superprojectPath + ".gitmodules", true);

GitCommands/Git/GitVersion.cs

@@ -11,6 +11,8 @@ public class GitVersion : IComparable<GitVersion>
         private static readonly GitVersion v1_7_11 = new GitVersion("1.7.11");
         private static readonly GitVersion v1_8_5 = new GitVersion("1.8.5");
         private static readonly GitVersion v2_0_1 = new GitVersion("2.0.1");
+        private static readonly GitVersion v2_5_1 = new GitVersion("2.5.1");
+        private static readonly GitVersion v2_7_0 = new GitVersion("2.7.0");
         private static readonly GitVersion v2_9_0 = new GitVersion("2.9.0");
 
         public static readonly GitVersion LastSupportedVersion = v1_7_0;
@@ -69,6 +71,16 @@ public bool RaceConditionWhenGitStatusIsUpdatingIndex
             get { return this < v2_0_1; }
         }
 
+        public bool SupportWorktree
+        {
+            get { return this >= v2_5_1; }
+        }
+
+        public bool SupportWorktreeList
+        {
+            get { return this >= v2_7_0; }
+        }
+
         public bool SupportMergeUnrelatedHistory
         {
             get { return this >= v2_9_0; }
@@ -147,7 +159,7 @@ private static int Compare(GitVersion left, GitVersion right)
             if (left == null && right == null) return 0;
             if (right == null) return 1;
             if (left == null) return -1;
-            
+
             int compareA = left.a.CompareTo(right.a);
             if (compareA != 0) return compareA;
 

GitUI/CommandsDialogs/FormBrowse.Designer.cs

@@ -20,6 +20,7 @@
 using GitCommands.Utils;
 using GitUI.CommandsDialogs.BrowseDialog;
 using GitUI.CommandsDialogs.BrowseDialog.DashboardControl;
+using GitUI.CommandsDialogs.WorktreeDialog;
 using GitUI.Hotkey;
 using GitUI.Plugin;
 using GitUI.Properties;
@@ -267,6 +268,19 @@ public FormBrowse(GitUICommands aCommands, string filter)
             SystemEvents.SessionEnding += (sender, args) => SaveApplicationSettings();
 
             FillTerminalTab();
+            ManageWorktreeSupport();
+        }
+
+        private void ManageWorktreeSupport()
+        {
+            if (!GitCommandHelpers.VersionInUse.SupportWorktree)
+            {
+                createWorktreeToolStripMenuItem.Enabled = false;
+            }
+            if (!GitCommandHelpers.VersionInUse.SupportWorktreeList)
+            {
+                manageWorktreeToolStripMenuItem.Enabled = false;
+            }
         }
 
         private new void Translate()
@@ -2046,7 +2060,7 @@ private void WorkingdirDropDownOpening(object sender, EventArgs e)
 
         }
 
-        private void SetWorkingDir(string path)
+        public void SetWorkingDir(string path)
         {
             SetGitModule(this, new GitModuleEventArgs(new GitModule(path)));
         }
@@ -3673,5 +3687,23 @@ private void toolStripMenuItemReflog_Click(object sender, EventArgs e)
                 RefreshRevisions();
             }
         }
+
+        private void manageWorktreeToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+            var formManageWorktree = new FormManageWorktree(UICommands);
+            formManageWorktree.ShowDialog(this);
+        }
+
+        private void createWorktreeToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var formCreateWorktree = new FormCreateWorktree(UICommands);
+            var dialogResult = formCreateWorktree.ShowDialog(this);
+            if (dialogResult == DialogResult.OK && formCreateWorktree.OpenWorktree)
+            {
+                var newModule = new GitModule(formCreateWorktree.WorktreeDirectory);
+                SetGitModule(this, new GitModuleEventArgs(newModule));
+            }
+        }
     }
 }

GitUI/CommandsDialogs/FormBrowse.cs

@@ -151,6 +151,6 @@
     <value>352, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>217</value>
   </metadata>
 </root>