Skip to content

Commit 09487ee

Browse files
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.
2 parents 3d83058 + 9293a91 commit 09487ee

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

Scalar/CommandLine/RunVerb.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected override void Execute(ScalarEnlistment enlistment)
118118
switch (this.MaintenanceTask)
119119
{
120120
case ScalarConstants.VerbParameters.Maintenance.AllTasksName:
121-
steps.Add(new ConfigStep(context));
121+
steps.Add(new ConfigStep(context, gitFeatures: gitFeatures));
122122
this.InitializeServerConnection(tracer, enlistment, cacheServerUrl, out objectRequestor, out cacheServer);
123123
gitObjects = new GitObjects(tracer, enlistment, objectRequestor, fileSystem);
124124
steps.Add(new FetchStep(context, gitObjects, requireCacheLock: false, gitFeatures: gitFeatures, forceRun: !this.StartedByService));
@@ -162,7 +162,7 @@ protected override void Execute(ScalarEnlistment enlistment)
162162

163163
case ScalarConstants.VerbParameters.Maintenance.ConfigTaskName:
164164
this.FailIfBatchSizeSet(tracer);
165-
steps.Add(new ConfigStep(context));
165+
steps.Add(new ConfigStep(context, gitFeatures: gitFeatures));
166166
break;
167167

168168
default:

0 commit comments

Comments
 (0)