diff options
| author | Mike Krüger <mikkrg@microsoft.com> | 2019-09-16 12:42:54 +0300 |
|---|---|---|
| committer | Mike Krüger <mikkrg@microsoft.com> | 2019-09-20 11:56:37 +0300 |
| commit | 778ffeb863465686a51a9e307a366b59a4063fa4 (patch) | |
| tree | b20a3acd339783494e6ee258536286c5dcc65d8e /main/src | |
| parent | a813dd32130af3759488cc74391c148133f8845a (diff) | |
[VersionControl] Fixed merge errors.
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs index f9d1aeb657..5ed679e980 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs @@ -971,7 +971,7 @@ namespace MonoDevelop.VersionControl.Git } } - await RunOperationAsync (() => GetFilesVersionInfoCore (repository, rev, group.ToList (), versions)).ConfigureAwait (false); + await GetFilesVersionInfoCoreAsync (repository, rev, group.ToList (), versions).ConfigureAwait (false); } } } else { @@ -1014,7 +1014,7 @@ namespace MonoDevelop.VersionControl.Git } } - await RunOperationAsync (() => GetDirectoryVersionInfoCore (rootRepository, arev, localDirectory.CanonicalPath, versions, recursive)).ConfigureAwait (false); + await GetDirectoryVersionInfoCoreAsync (rootRepository, arev, localDirectory.CanonicalPath, versions, recursive).ConfigureAwait (false); } return versions.ToArray (); @@ -1611,11 +1611,6 @@ namespace MonoDevelop.VersionControl.Git return; } - if (monitor.CancellationToken.IsCancellationRequested) - return; - - await innerTask.ConfigureAwait (false); - if (monitor.CancellationToken.IsCancellationRequested || RootPath.IsNull) return; |