Prettify Stash.Apply and Stash.Drop

Author: Therzok

Lib/NativeBinaries/amd64/git2-9bbc8f3.dll

@@ -176,6 +176,99 @@ public void CanStashAndKeepIndex()
             }
         }
 
+        [Fact]
+        public void CanStashAndApplyWithOptions()
+        {
+            string path = SandboxStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var stasher = Constants.Signature;
+
+                const string filename = "staged_file_path.txt";
+                Touch(repo.Info.WorkingDirectory, filename, "I'm staged\n");
+                repo.Stage(filename);
+
+                repo.Stashes.Add(stasher, "This stash with default options");
+                Assert.Equal(StashApplyStatus.Applied, repo.Stashes.Apply(0));
+
+                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(filename));
+                Assert.Equal(1, repo.Stashes.Count());
+
+                repo.Stage(filename);
+
+                repo.Stashes.Add(stasher, "This stash with default options");
+                Assert.Equal(StashApplyStatus.Applied, repo.Stashes.Apply(0, StashApplyModifiers.ReinstateIndex));
+
+                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(2, repo.Stashes.Count());
+            }
+        }
+
+        [Fact]
+        public void CanStashAndPop()
+        {
+            string path = SandboxStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var stasher = Constants.Signature;
+
+                const string filename = "staged_file_path.txt";
+                Touch(repo.Info.WorkingDirectory, filename, "I'm staged\n");
+                repo.Stage(filename);
+
+                repo.Stashes.Add(stasher, "This stash with default options");
+                Assert.Equal(StashApplyStatus.Applied, repo.Stashes.Pop(0));
+
+                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(filename));
+                Assert.Equal(0, repo.Stashes.Count());
+            }
+        }
+
+        [Fact]
+        public void StashReportsConflictsWhenReinstated()
+        {
+            string path = SandboxStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var stasher = Constants.Signature;
+
+                const string filename = "staged_file_path.txt";
+                const string filename2 = "unstaged_file_path.txt";
+                Touch(repo.Info.WorkingDirectory, filename, "I'm staged\n");
+                repo.Stage(filename);
+                Touch(repo.Info.WorkingDirectory, filename2, "I'm unstaged\n");
+
+                repo.Stashes.Add(stasher, "This stash with default options");
+
+                Touch(repo.Info.WorkingDirectory, filename, "I'm another staged\n");
+                repo.Stage(filename);
+                Touch(repo.Info.WorkingDirectory, filename2, "I'm unstaged another staged\n");
+
+                Assert.Equal(StashApplyStatus.Conflicts, repo.Stashes.Pop(0, StashApplyModifiers.ReinstateIndex));
+
+                // TODO: Find out why repo.Index.Conflicts doesn't have any data.
+                Assert.NotNull(repo.Index.Conflicts[filename]);
+            }
+        }
+
+        [Fact]
+        public void StashReportsExistingInWorkDir()
+        {
+            string path = SandboxStandardTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var stasher = Constants.Signature;
+
+                const string filename = "unstaged_file_path.txt";
+                Touch(repo.Info.WorkingDirectory, filename, "I'm unstaged\n");
+
+                repo.Stashes.Add(stasher, "This stash with default options", StashModifiers.IncludeUntracked);
+                Touch(repo.Info.WorkingDirectory, filename, "I'm another unstaged\n");
+
+                Assert.Equal(StashApplyStatus.UntrackedExist, repo.Stashes.Pop(0));
+            }
+        }
+
         [Fact]
         public void CanStashIgnoredFiles()
         {

Lib/NativeBinaries/amd64/git2-b2d0243.dll

@@ -158,6 +158,7 @@ internal struct GitCheckoutOpts
         public GitStrArray paths;
 
         public IntPtr baseline;
+        public IntPtr baseline_index;
         public IntPtr target_directory;
 
         public IntPtr ancestor_label;

Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb renamed to Lib/NativeBinaries/amd64/git2-b2d0243.pdb

@@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core
 {
 	internal static class NativeDllName
 	{
-		public const string Name = "git2-9bbc8f3";
+		public const string Name = "git2-b2d0243";
 	}
 }

Lib/NativeBinaries/x86/git2-9bbc8f3.dll

@@ -2723,29 +2723,41 @@ public static void git_stash_drop(RepositorySafeHandle repo, int index)
             }
         }
 
-        public static void git_stash_apply(
+        static StashApplyStatus get_stash_status(int res)
+        {
+            if (res == (int)GitErrorCode.MergeConflict)
+            {
+                return StashApplyStatus.Conflicts;
+            }
+            if (res == (int)GitErrorCode.Exists)
+            {
+                return StashApplyStatus.UntrackedExist;
+            }
+            Ensure.ZeroResult(res);
+            return StashApplyStatus.Applied;
+        }
+
+        public static StashApplyStatus git_stash_apply(
             RepositorySafeHandle repo,
             int index,
             ref GitCheckoutOpts opts,
             StashApplyModifiers flags)
         {
             using (ThreadAffinity())
             {
-                int res = NativeMethods.git_stash_apply(repo, (UIntPtr)index, ref opts, flags);
-                Ensure.ZeroResult(res);
+                return get_stash_status(NativeMethods.git_stash_apply(repo, (UIntPtr)index, ref opts, flags));
             }
         }
 
-        public static void git_stash_pop(
+        public static StashApplyStatus git_stash_pop(
             RepositorySafeHandle repo,
             int index,
             ref GitCheckoutOpts opts,
             StashApplyModifiers flags)
         {
             using (ThreadAffinity())
             {
-                int res = NativeMethods.git_stash_pop(repo, (UIntPtr)index, ref opts, flags);
-                Ensure.ZeroResult(res);
+                return get_stash_status(NativeMethods.git_stash_pop(repo, (UIntPtr)index, ref opts, flags));
             }
         }