NuKeeperDotNet · MartinDemberger · Sep 21, 2021 · Sep 21, 2021
diff --git a/NuKeeper.Abstractions/Configuration/FileSettings.cs b/NuKeeper.Abstractions/Configuration/FileSettings.cs
@@ -44,6 +44,7 @@ public class FileSettings
 
         public string GitCliPath { get; set; }
         public int? MaxOpenPullRequests { get; set; }
+        public bool? ThrowOnGitError { get; set; }
 
         public static FileSettings Empty()
         {

diff --git a/NuKeeper.Abstractions/Configuration/UserSettings.cs b/NuKeeper.Abstractions/Configuration/UserSettings.cs
@@ -16,6 +16,8 @@ public class UserSettings
 
         public UsePrerelease UsePrerelease { get; set; }
 
+        public bool ThrowOnGitError { get; set; }
+
 
         public OutputFormat OutputFormat { get; set; }
         public OutputDestination OutputDestination { get; set; }

diff --git a/NuKeeper.Git/LibGit2SharpDriver.cs b/NuKeeper.Git/LibGit2SharpDriver.cs
@@ -180,12 +180,19 @@ public Task Commit(string message)
         {
             return Task.Run(() =>
             {
-                _logger.Detailed($"Git commit with message '{message}'");
-                using (var repo = MakeRepo())
+                try
+                {
+                    _logger.Detailed($"Git commit with message '{message}'");
+                    using (var repo = MakeRepo())
+                    {
+                        var signature = GetSignature(repo);
+                        GitCommands.Stage(repo, "*");
+                        repo.Commit(message, signature, signature);
+                    }
+                }
+                catch (EmptyCommitException)
                 {
-                    var signature = GetSignature(repo);
-                    GitCommands.Stage(repo, "*");
-                    repo.Commit(message, signature, signature);
+                    _logger.Normal($"Empty commit with message '{message}' is ignored");
                 }
             });
         }

diff --git a/NuKeeper.Inspection.Tests/NuGetApi/ApiPackageLookupTests.cs b/NuKeeper.Inspection.Tests/NuGetApi/ApiPackageLookupTests.cs
@@ -25,7 +25,8 @@ public async Task WhenNoPackagesAreFound()
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             Assert.That(updates, Is.Not.Null);
             Assert.That(updates.Major, Is.Null);
@@ -48,7 +49,8 @@ public async Task WhenThereIsOnlyOneVersion()
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             Assert.That(updates, Is.Not.Null);
 
@@ -74,7 +76,8 @@ public async Task WhenMajorVersionChangesAreAllowed(VersionChange dataRange,
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -98,7 +101,8 @@ public async Task WhenMinorVersionChangesAreAllowed(VersionChange dataRange,
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Minor,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -122,7 +126,8 @@ public async Task WhenPatchVersionChangesAreAllowed(VersionChange dataRange,
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Patch,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -132,7 +137,7 @@ public async Task WhenPatchVersionChangesAreAllowed(VersionChange dataRange,
         private static IPackageVersionsLookup MockVersionLookup(List<PackageSearchMetadata> actualResults)
         {
             var allVersions = Substitute.For<IPackageVersionsLookup>();
-            allVersions.Lookup(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<NuGetSources>())
+            allVersions.Lookup(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<NuGetSources>())
                 .Returns(actualResults);
             return allVersions;
         }

diff --git a/NuKeeper.Inspection.Tests/NuGetApi/BulkPackageLookupTests.cs b/NuKeeper.Inspection.Tests/NuGetApi/BulkPackageLookupTests.cs
@@ -28,13 +28,14 @@ public async Task CanLookupEmptyList()
                 Enumerable.Empty<PackageIdentity>(),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results, Is.Empty);
 
             await apiLookup.DidNotReceive().FindVersionUpdate(
-                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>());
+                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>(), Arg.Any<bool>());
         }
 
         [Test]
@@ -54,7 +55,8 @@ public async Task CanLookupOnePackage()
             var results = await bulkLookup.FindVersionUpdates(queries,
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results, Is.Not.Empty);
@@ -79,10 +81,11 @@ public async Task LookupOnePackageCallsApiOnce()
             await bulkLookup.FindVersionUpdates(queries,
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             await apiLookup.Received(1).FindVersionUpdate(
-                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>());
+                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>(), Arg.Any<bool>());
         }
 
         [Test]
@@ -104,7 +107,8 @@ public async Task CanLookupTwoPackages()
             var results = await bulkLookup.FindVersionUpdates(queries,
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             var packages = results.Select(kvp => kvp.Key);
             Assert.That(results.Count, Is.EqualTo(2));
@@ -132,10 +136,11 @@ public async Task LookupTwoPackagesCallsApiTwice()
             await bulkLookup.FindVersionUpdates(queries,
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             await apiLookup.Received(2).FindVersionUpdate(
-                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>());
+                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>(), Arg.Any<bool>());
         }
 
         [Test]
@@ -156,13 +161,14 @@ public async Task WhenThereAreMultipleVersionOfTheSamePackage()
             var results = await bulkLookup.FindVersionUpdates(queries,
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             await apiLookup.Received(1).FindVersionUpdate(
-                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>());
+                Arg.Any<PackageIdentity>(), Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>(), Arg.Any<bool>());
             await apiLookup.Received(1).FindVersionUpdate(Arg.Is<PackageIdentity>(
                 pi => pi.Id == "foo" && pi.Version == new NuGetVersion(1, 3, 4)),
-                Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>());
+                Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>(), Arg.Any<bool>());
 
             var packages = results.Select(kvp => kvp.Key);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -177,7 +183,7 @@ private static void ApiHasNewVersionForPackage(IApiPackageLookup lookup, string
                 DateTimeOffset.Now, null);
 
             lookup.FindVersionUpdate(Arg.Is<PackageIdentity>(pm => pm.Id == packageName),
-                    Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>())
+                    Arg.Any<NuGetSources>(), Arg.Any<VersionChange>(), Arg.Any<UsePrerelease>(), Arg.Any<bool>())
                 .Returns(new PackageLookupResult(VersionChange.Major, responseMetaData, responseMetaData, responseMetaData));
         }
 

diff --git a/NuKeeper.Inspection.Tests/NuGetApi/PackageUpdatesLookupTests.cs b/NuKeeper.Inspection.Tests/NuGetApi/PackageUpdatesLookupTests.cs
@@ -30,7 +30,8 @@ public void Initialize()
                     Arg.Any<PackageIdentity>(),
                     Arg.Any<NuGetSources>(),
                     VersionChange.Minor,
-                    Arg.Any<UsePrerelease>()
+                    Arg.Any<UsePrerelease>(),
+                    Arg.Any<bool>()
                 )
                 .Returns(ci =>
                     GetPackageLookupResult(
@@ -54,7 +55,8 @@ public async Task FindUpdatesForPackages_OnePackageDifferentVersionsInDifferentP
                 packagesInProjects,
                 new NuGetSources("https://api.nuget.com/"),
                 VersionChange.Minor,
-                UsePrerelease.Never
+                UsePrerelease.Never,
+                true
             );
 
             var versionUpdates = result.Select(p => p.SelectedVersion.ToNormalizedString()).ToList();

diff --git a/NuKeeper.Inspection.Tests/NuGetApi/UsePrereleaseLookupTests.cs b/NuKeeper.Inspection.Tests/NuGetApi/UsePrereleaseLookupTests.cs
@@ -43,7 +43,8 @@ public async Task WhenFromPrereleaseIsAllowedFromPrereleaseAndCurrentVersionIsPr
                 CurrentVersion123Prerelease("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -67,7 +68,8 @@ public async Task WhenFromPrereleaseIsAllowedFromPrereleaseAndCurrentVersionIsSt
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.FromPrerelease);
+                UsePrerelease.FromPrerelease,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -102,7 +104,8 @@ public async Task WhenFromPrereleaseIsAlwaysAllowedAndCurrentVersionIsPrerelease
                 CurrentVersion123Prerelease("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.Always);
+                UsePrerelease.Always,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -137,7 +140,8 @@ public async Task WhenFromPrereleaseIsAlwaysAllowedAndCurrentVersionIsStable(
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.Always);
+                UsePrerelease.Always,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -162,7 +166,8 @@ public async Task WhenFromPrereleaseIsNeverAllowedAndCurrentVersionIsPrerelease(
                 CurrentVersion123Prerelease("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.Never);
+                UsePrerelease.Never,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -187,7 +192,8 @@ public async Task WhenFromPrereleaseIsNeverAllowedAndCurrentVersionIsStable(
                 CurrentVersion123("TestPackage"),
                 NuGetSources.GlobalFeed,
                 VersionChange.Major,
-                UsePrerelease.Never);
+                UsePrerelease.Never,
+                true);
 
             AssertPackagesIdentityIs(updates, "TestPackage");
             Assert.That(updates.Selected().Identity.Version, Is.EqualTo(expectedUpdate));
@@ -197,9 +203,9 @@ public async Task WhenFromPrereleaseIsNeverAllowedAndCurrentVersionIsStable(
         private static IPackageVersionsLookup MockVersionLookup(List<PackageSearchMetadata> actualResults)
         {
             var allVersions = Substitute.For<IPackageVersionsLookup>();
-            allVersions.Lookup(Arg.Any<string>(), false, Arg.Any<NuGetSources>())
+            allVersions.Lookup(Arg.Any<string>(), false, true, Arg.Any<NuGetSources>())
                 .Returns(actualResults.Where(x => !x.Identity.Version.IsPrerelease).ToList());
-            allVersions.Lookup(Arg.Any<string>(), true, Arg.Any<NuGetSources>())
+            allVersions.Lookup(Arg.Any<string>(), true, true, Arg.Any<NuGetSources>())
                 .Returns(actualResults);
             return allVersions;
         }

diff --git a/NuKeeper.Inspection.Tests/UpdateFinderTests.cs b/NuKeeper.Inspection.Tests/UpdateFinderTests.cs
@@ -35,7 +35,7 @@ public async Task FindWithoutResults()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease);
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(0));
@@ -63,7 +63,7 @@ public async Task FindWithOneResult()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease);
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -93,7 +93,7 @@ public async Task FindOneFilteredIncludeResult()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, new Regex("^somePackage"), null);
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true, new Regex("^somePackage"), null);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -124,7 +124,7 @@ public async Task FindTwoFilteredExcludeIncludeResults()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, new Regex("^andAnotherPackage"), new Regex("^anotherPackage"));
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true, new Regex("^andAnotherPackage"), new Regex("^anotherPackage"));
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -154,7 +154,7 @@ public async Task FindOneFilteredExcludeResult()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, null, new Regex("^anotherPackage"));
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true, null, new Regex("^anotherPackage"));
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -184,7 +184,7 @@ public async Task FindSkipsMetapackageResult()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease);
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -216,7 +216,7 @@ public async Task FindSkipsBothMetapackageResult()
             var finder = new UpdateFinder(scanner, updater, logger);
 
             var results = await finder.FindPackageUpdateSets(
-                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease);
+                folder, NuGetSources.GlobalFeed, VersionChange.Major, UsePrerelease.FromPrerelease, true);
 
             Assert.That(results, Is.Not.Null);
             Assert.That(results.Count, Is.EqualTo(1));
@@ -236,7 +236,8 @@ private void ReturnsUpdateSetForEachPackage(IPackageUpdatesLookup updater)
                     Arg.Any<IReadOnlyCollection<PackageInProject>>(),
                     Arg.Any<NuGetSources>(),
                     Arg.Any<VersionChange>(),
-                    Arg.Any<UsePrerelease>())
+                    Arg.Any<UsePrerelease>(),
+                    Arg.Any<bool>())
                 .Returns(a => a.ArgAt<IReadOnlyCollection<PackageInProject>>(0)
                     .Select(BuildPackageUpdateSet)
                     .ToList());

diff --git a/NuKeeper.Inspection/IUpdateFinder.cs b/NuKeeper.Inspection/IUpdateFinder.cs
@@ -25,6 +25,7 @@ Task<IReadOnlyCollection<PackageUpdateSet>> FindPackageUpdateSets(
             NuGetSources sources,
             VersionChange allowedChange,
             UsePrerelease usePrerelease,
+            bool throwOnGitError,
             Regex include = null,
             Regex exclude = null);
     }

diff --git a/NuKeeper.Inspection/NuGetApi/ApiPackageLookup.cs b/NuKeeper.Inspection/NuGetApi/ApiPackageLookup.cs
@@ -21,7 +21,8 @@ public async Task<PackageLookupResult> FindVersionUpdate(
             PackageIdentity package,
             NuGetSources sources,
             VersionChange allowedChange,
-            UsePrerelease usePrerelease)
+            UsePrerelease usePrerelease,
+            bool throwOnGitError)
         {
             if (package == null)
             {
@@ -30,7 +31,7 @@ public async Task<PackageLookupResult> FindVersionUpdate(
 
             var includePrerelease = ShouldAllowPrerelease(package, usePrerelease);
 
-            var foundVersions = await _packageVersionsLookup.Lookup(package.Id, includePrerelease, sources);
+            var foundVersions = await _packageVersionsLookup.Lookup(package.Id, includePrerelease, throwOnGitError, sources);
             return VersionChanges.MakeVersions(package.Version, foundVersions, allowedChange);
         }