GitAddin: Fixed removing files with status 'Added'

src/AddIns/VersionControl/GitAddIn/Src/Git.cs

@@ -61,6 +61,17 @@ namespace ICSharpCode.GitAddIn
 			RunGit(wcRoot, "add " + AdaptFileName(wcRoot, fileName), callback);
 		}
 		
+		public static void Remove(string fileName, bool indexOnly, Action<int> callback)
+		{
+			string wcRoot = FindWorkingCopyRoot(fileName);
+			if (wcRoot == null)
+				return;
+			if (indexOnly)
+				RunGit(wcRoot, "rm --cached " + AdaptFileName(wcRoot, fileName), callback);
+			else
+				RunGit(wcRoot, "rm " + AdaptFileName(wcRoot, fileName), callback);
+		}
+		
 		public static string AdaptFileName(string wcRoot, string fileName)
 		{
 			return '"' + AdaptFileNameNoQuotes(wcRoot, fileName) + '"';

src/AddIns/VersionControl/GitAddIn/Src/RegisterEventsCommand.cs

@@ -34,6 +34,12 @@ namespace ICSharpCode.GitAddIn
 				        exitcode => WorkbenchSingleton.SafeThreadAsyncCall(ClearStatusCacheAndEnqueueFile, args.FileName)
 				       );
 			};
+			FileService.FileRemoved += (sender, args) => {
+				if (GitStatusCache.GetFileStatus(args.FileName) == GitStatus.Added) {
+					Git.Remove(args.FileName, true,
+					           exitcode => WorkbenchSingleton.SafeThreadAsyncCall(ClearStatusCacheAndEnqueueFile, args.FileName));
+				}
+			};
 			FileUtility.FileSaved += (sender, e) => {
 				ClearStatusCacheAndEnqueueFile(e.FileName);
 			};
@@ -67,7 +73,7 @@ namespace ICSharpCode.GitAddIn
 			if (pad == null) return;
 			FileNode node = pad.ProjectBrowserControl.FindFileNode(fileName);
 			if (node == null) return;
-					OverlayIconManager.EnqueueParents(node);
+			OverlayIconManager.EnqueueParents(node);
 		}
 	}
 }