Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortherzok <marius.ungureanu@xamarin.com>2019-09-13 18:17:19 +0300
committermonojenkins <jo.shields+jenkins@xamarin.com>2019-09-16 18:48:24 +0300
commit1e8c6fe208a4726007e71d1709a01996fde3f493 (patch)
tree3059a2c8fea6a0f35a9981bd02195ce43e53dedb
parent9eda0a2ac7f8b126b9d27f7f528451105e05aaa8 (diff)
[VersionControl] Ignore trying to add items which are ignored
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
index 256d3c981e..fc37ca6ed9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
@@ -522,7 +522,7 @@ namespace MonoDevelop.VersionControl
monitor = GetStatusMonitor ();
var gotInfo = repo.TryGetVersionInfo (file, out var versionInfo);
- if (gotInfo == false || versionInfo.CanAdd)
+ if (gotInfo == false || (versionInfo.Status & VersionStatus.Ignored) == 0 && versionInfo.CanAdd)
await repo.AddAsync (file, false, monitor);
}
vargs.AddRange (repoFiles.Select (i => new FileUpdateEventInfo (repo, i.ProjectFile.FilePath, i.ProjectFile.Subtype == Subtype.Directory)));