Merge pull request #451: RunVerb: pass git features to ConfigStep

The ConfigStep makes a decision about calling 'git maintenance start' depending on the platform (Linux only for now) and the Git version. However, the code for computing the feature flags is in ScalarVerb and needs to be injected by passing it through the ConfigStep constructor. This was missed in the earlier work that inserted this into other maintenance steps. This fixes a feature that should have been introduced in #398.
microsoft · Oct 16, 2020 · 09487ee · 09487ee
2 parents 3d83058 + 9293a91
commit 09487ee
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Scalar/CommandLine/RunVerb.cs b/Scalar/CommandLine/RunVerb.cs
@@ -118,7 +118,7 @@ protected override void Execute(ScalarEnlistment enlistment)
                         switch (this.MaintenanceTask)
                         {
                             case ScalarConstants.VerbParameters.Maintenance.AllTasksName:
-                                steps.Add(new ConfigStep(context));
+                                steps.Add(new ConfigStep(context, gitFeatures: gitFeatures));
                                 this.InitializeServerConnection(tracer, enlistment, cacheServerUrl, out objectRequestor, out cacheServer);
                                 gitObjects = new GitObjects(tracer, enlistment, objectRequestor, fileSystem);
                                 steps.Add(new FetchStep(context, gitObjects, requireCacheLock: false, gitFeatures: gitFeatures, forceRun: !this.StartedByService));
@@ -162,7 +162,7 @@ protected override void Execute(ScalarEnlistment enlistment)
 
                             case ScalarConstants.VerbParameters.Maintenance.ConfigTaskName:
                                 this.FailIfBatchSizeSet(tracer);
-                                steps.Add(new ConfigStep(context));
+                                steps.Add(new ConfigStep(context, gitFeatures: gitFeatures));
                                 break;
 
                             default: