Apply Matthias Luescher patch trevorr#42 - 'Fix moving of empty direc…

…tories' Signed-off-by: Július Adam <[email protected]>
JAD-SVK · Jul 6, 2016 · b576760 · b576760
1 parent 7d90413
commit b576760
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Vss2Git/AbstractVcsWrapper.cs b/Vss2Git/AbstractVcsWrapper.cs
@@ -157,6 +157,12 @@ public void VcsExec(string args)
             ExecuteUnless(startInfo, null);
         }
 
+        public bool VcsExecUnless(string args, string unless)
+        {
+            var startInfo = GetStartInfo(args);
+            return ExecuteUnless(startInfo, unless);
+        }
+
         public void Exec(string exe, string args)
         {
             var startInfo = GetStartInfo(exe, args);

diff --git a/Vss2Git/GitWrapper.cs b/Vss2Git/GitWrapper.cs
@@ -248,7 +248,10 @@ public override void RemoveEmptyDir(string path)
 
         public override void Move(string sourcePath, string destPath)
         {
-            VcsExec("mv -f -- " + QuoteRelativePath(sourcePath) + " " + QuoteRelativePath(destPath));
+            if (!VcsExecUnless("mv -f -- " + QuoteRelativePath(sourcePath) + " " + QuoteRelativePath(destPath), "source directory is empty"))
+            {
+                Directory.Move(sourcePath, destPath);
+            }
             SetNeedsCommit();
         }