Surface number of submodules to sync

jcansdale · jcansdale · commit a8ef148fb22e · 2018-01-19T15:58:51.000Z
Change IsSyncSubmodulesRequired to CountSubmodulesToSync.
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -104,36 +104,33 @@ public IObservable<IReadOnlyList<CommitMessage>> GetMessagesForUniqueCommits(
             });
         }
 
-        public IObservable<bool> IsSyncSubmodulesRequired(ILocalRepositoryModel repository)
+        public IObservable<int> CountSubmodulesToSync(ILocalRepositoryModel repository)
         {
             using (var repo = gitService.GetRepository(repository.LocalPath))
             {
+                var count = 0;
                 foreach (var submodule in repo.Submodules)
                 {
                     var status = submodule.RetrieveStatus();
-
                     if ((status & SubmoduleStatus.WorkDirAdded) != 0)
                     {
-                        return Observable.Return(true);
+                        count++;
                     }
-
-                    if ((status & SubmoduleStatus.WorkDirDeleted) != 0)
+                    else if ((status & SubmoduleStatus.WorkDirDeleted) != 0)
                     {
-                        return Observable.Return(true);
+                        count++;
                     }
-
-                    if ((status & SubmoduleStatus.WorkDirModified) != 0)
+                    else if ((status & SubmoduleStatus.WorkDirModified) != 0)
                     {
-                        return Observable.Return(true);
+                        count++;
                     }
-
-                    if ((status & SubmoduleStatus.WorkDirUninitialized) != 0)
+                    else if ((status & SubmoduleStatus.WorkDirUninitialized) != 0)
                     {
-                        return Observable.Return(true);
+                        count++;
                     }
                 }
 
-                return Observable.Return(false);
+                return Observable.Return(count);
             }
         }
 
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs
@@ -408,9 +408,9 @@ public async Task Load(IPullRequestModel pullRequest)
                         pushToolTip = Resources.MustPullBeforePush;
                     }
 
-                    var syncSubmodulesEnabled = await pullRequestsService.IsSyncSubmodulesRequired(LocalRepository);
+                    var submodulesToSync = await pullRequestsService.CountSubmodulesToSync(LocalRepository);
 
-                    UpdateState = new UpdateCommandState(divergence, pullEnabled, pushEnabled, pullToolTip, pushToolTip, syncSubmodulesEnabled);
+                    UpdateState = new UpdateCommandState(divergence, pullEnabled, pushEnabled, pullToolTip, pushToolTip, submodulesToSync);
                     CheckoutState = null;
                 }
                 else
@@ -707,15 +707,15 @@ public UpdateCommandState(
                 bool pushEnabled,
                 string pullToolTip,
                 string pushToolTip,
-                bool syncSubmodulesEnabled)
+                int submodulesToSync)
             {
                 CommitsAhead = divergence.AheadBy ?? 0;
                 CommitsBehind = divergence.BehindBy ?? 0;
                 PushEnabled = pushEnabled;
                 PullEnabled = pullEnabled;
                 PullToolTip = pullToolTip;
                 PushToolTip = pushToolTip;
-                SyncSubmodulesEnabled = syncSubmodulesEnabled;
+                SubmodulesToSync = submodulesToSync;
             }
 
             public int CommitsAhead { get; }
@@ -725,7 +725,8 @@ public UpdateCommandState(
             public bool PushEnabled { get; }
             public string PullToolTip { get; }
             public string PushToolTip { get; }
-            public bool SyncSubmodulesEnabled { get; }
+            public bool SyncSubmodulesEnabled => SubmodulesToSync > 0;
+            public int SubmodulesToSync { get; }
         }
     }
 }
diff --git a/src/GitHub.Exports.Reactive/Services/IPullRequestService.cs b/src/GitHub.Exports.Reactive/Services/IPullRequestService.cs
@@ -25,11 +25,11 @@ IObservable<IPullRequestModel> CreatePullRequest(IModelService modelService,
         IObservable<bool> IsWorkingDirectoryClean(ILocalRepositoryModel repository);
 
         /// <summary>
-        /// Check if user needs to sync submodules on current branch.
+        /// Count the number of submodules that require syncing.
         /// </summary>
         /// <param name="repository">The repository.</param>
-        /// <returns>True if submodules need to be synced.</returns>
-        IObservable<bool> IsSyncSubmodulesRequired(ILocalRepositoryModel repository);
+        /// <returns>The number of submodules that need to be synced.</returns>
+        IObservable<int> CountSubmodulesToSync(ILocalRepositoryModel repository);
 
         /// <summary>
         /// Checks out a pull request to a local branch.
diff --git a/test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs b/test/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs
@@ -253,7 +253,7 @@ public async Task ChangedSubmodule_True()
         }
     }
 
-    public class TheIsSyncSubmodulesRequiredMethod
+    public class TheCountSubmodulesToSyncMethod
     {
         [Fact] // WorkDirDeleted
         public async Task CommittedSubmodule_True()
@@ -269,9 +269,9 @@ public async Task CommittedSubmodule_True()
                 var service = CreatePullRequestService(repo);
                 var repositoryModel = CreateLocalRepositoryModel(repo);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.True(isRequired);
+                Assert.Equal(1, count);
             }
         }
 
@@ -292,9 +292,9 @@ public async Task UninitializedSubmodule_True()
                 var service = CreatePullRequestService(repo);
                 var repositoryModel = CreateLocalRepositoryModel(repo);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.True(isRequired);
+                Assert.Equal(1, count);
             }
         }
 
@@ -316,9 +316,9 @@ public async Task ChangedSubmodule_True()
                 var service = CreatePullRequestService(repo);
                 var repositoryModel = CreateLocalRepositoryModel(repo);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.True(isRequired);
+                Assert.Equal(1, count);
             }
         }
 
@@ -339,9 +339,9 @@ public async Task UpdatedSubmodule_False()
                 var service = CreatePullRequestService(repo);
                 var repositoryModel = CreateLocalRepositoryModel(repo);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -354,9 +354,9 @@ public async Task NewRepo_False()
                 var service = CreatePullRequestService(repo);
                 var repositoryModel = CreateLocalRepositoryModel(repo);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -371,9 +371,9 @@ public async Task UntrackedFile_False()
                 var file = Path.Combine(repo.Info.WorkingDirectory, "file.txt");
                 File.WriteAllText(file, "contents");
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -390,9 +390,9 @@ public async Task CommitFile_False()
                 Commands.Stage(repo, file);
                 repo.Commit("foo", Author, Author);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -409,9 +409,9 @@ public async Task AddedFile_False()
                 File.WriteAllText(file, "contents");
                 Commands.Stage(repo, path);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -430,9 +430,9 @@ public async Task ModifiedFile_False()
                 repo.Commit("foo", Author, Author);
                 File.WriteAllText(file, "contents2");
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -452,9 +452,9 @@ public async Task StagedFile_False()
                 File.WriteAllText(file, "contents2");
                 Commands.Stage(repo, path);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -473,9 +473,9 @@ public async Task MissingFile_False()
                 repo.Commit("foo", Author, Author);
                 File.Delete(file);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -495,9 +495,9 @@ public async Task RemovedFile_False()
                 File.Delete(file);
                 Commands.Stage(repo, path);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -520,9 +520,9 @@ public async Task RenamedInIndexFile_False()
                 Commands.Stage(repo, path);
                 Commands.Stage(repo, renamedPath);
 
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
 
@@ -546,9 +546,9 @@ public async Task RenamedInWorkingDirFile_False()
                 // NOTE: `RetrieveStatus(new StatusOptions { DetectRenamesInWorkDir = true })` would need to be used
                 // for renamed files to appear as `RenamedInWorkingDir` rather than `Missing` and `Untracked`.
                 // This isn't required in the current implementation.
-                var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();
+                var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();
 
-                Assert.False(isRequired);
+                Assert.Equal(0, count);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -104,36 +104,33 @@ public IObservable<IReadOnlyList<CommitMessage>> GetMessagesForUniqueCommits(`
`104`	`104`	`});`
`105`	`105`	`}`
`106`	`106`
`107`		`- public IObservable<bool> IsSyncSubmodulesRequired(ILocalRepositoryModel repository)`
	`107`	`+ public IObservable<int> CountSubmodulesToSync(ILocalRepositoryModel repository)`
`108`	`108`	`{`
`109`	`109`	`using (var repo = gitService.GetRepository(repository.LocalPath))`
`110`	`110`	`{`
	`111`	`+ var count = 0;`
`111`	`112`	`foreach (var submodule in repo.Submodules)`
`112`	`113`	`{`
`113`	`114`	`var status = submodule.RetrieveStatus();`
`114`		`-`
`115`	`115`	`if ((status & SubmoduleStatus.WorkDirAdded) != 0)`
`116`	`116`	`{`
`117`		`- return Observable.Return(true);`
	`117`	`+ count++;`
`118`	`118`	`}`
`119`		`-`
`120`		`- if ((status & SubmoduleStatus.WorkDirDeleted) != 0)`
	`119`	`+ else if ((status & SubmoduleStatus.WorkDirDeleted) != 0)`
`121`	`120`	`{`
`122`		`- return Observable.Return(true);`
	`121`	`+ count++;`
`123`	`122`	`}`
`124`		`-`
`125`		`- if ((status & SubmoduleStatus.WorkDirModified) != 0)`
	`123`	`+ else if ((status & SubmoduleStatus.WorkDirModified) != 0)`
`126`	`124`	`{`
`127`		`- return Observable.Return(true);`
	`125`	`+ count++;`
`128`	`126`	`}`
`129`		`-`
`130`		`- if ((status & SubmoduleStatus.WorkDirUninitialized) != 0)`
	`127`	`+ else if ((status & SubmoduleStatus.WorkDirUninitialized) != 0)`
`131`	`128`	`{`
`132`		`- return Observable.Return(true);`
	`129`	`+ count++;`
`133`	`130`	`}`
`134`	`131`	`}`
`135`	`132`
`136`		`- return Observable.Return(false);`
	`133`	`+ return Observable.Return(count);`
`137`	`134`	`}`
`138`	`135`	`}`
`139`	`136`
Original file line number	Diff line number	Diff line change
`@@ -408,9 +408,9 @@ public async Task Load(IPullRequestModel pullRequest)`
`408`	`408`	`pushToolTip = Resources.MustPullBeforePush;`
`409`	`409`	`}`
`410`	`410`
`411`		`- var syncSubmodulesEnabled = await pullRequestsService.IsSyncSubmodulesRequired(LocalRepository);`
	`411`	`+ var submodulesToSync = await pullRequestsService.CountSubmodulesToSync(LocalRepository);`
`412`	`412`
`413`		`- UpdateState = new UpdateCommandState(divergence, pullEnabled, pushEnabled, pullToolTip, pushToolTip, syncSubmodulesEnabled);`
	`413`	`+ UpdateState = new UpdateCommandState(divergence, pullEnabled, pushEnabled, pullToolTip, pushToolTip, submodulesToSync);`
`414`	`414`	`CheckoutState = null;`
`415`	`415`	`}`
`416`	`416`	`else`
`@@ -707,15 +707,15 @@ public UpdateCommandState(`
`707`	`707`	`bool pushEnabled,`
`708`	`708`	`string pullToolTip,`
`709`	`709`	`string pushToolTip,`
`710`		`- bool syncSubmodulesEnabled)`
	`710`	`+ int submodulesToSync)`
`711`	`711`	`{`
`712`	`712`	`CommitsAhead = divergence.AheadBy ?? 0;`
`713`	`713`	`CommitsBehind = divergence.BehindBy ?? 0;`
`714`	`714`	`PushEnabled = pushEnabled;`
`715`	`715`	`PullEnabled = pullEnabled;`
`716`	`716`	`PullToolTip = pullToolTip;`
`717`	`717`	`PushToolTip = pushToolTip;`
`718`		`- SyncSubmodulesEnabled = syncSubmodulesEnabled;`
	`718`	`+ SubmodulesToSync = submodulesToSync;`
`719`	`719`	`}`
`720`	`720`
`721`	`721`	`public int CommitsAhead { get; }`
`@@ -725,7 +725,8 @@ public UpdateCommandState(`
`725`	`725`	`public bool PushEnabled { get; }`
`726`	`726`	`public string PullToolTip { get; }`
`727`	`727`	`public string PushToolTip { get; }`
`728`		`- public bool SyncSubmodulesEnabled { get; }`
	`728`	`+ public bool SyncSubmodulesEnabled => SubmodulesToSync > 0;`
	`729`	`+ public int SubmodulesToSync { get; }`
`729`	`730`	`}`
`730`	`731`	`}`
`731`	`732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ public async Task ChangedSubmodule_True()`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
`256`		`- public class TheIsSyncSubmodulesRequiredMethod`
	`256`	`+ public class TheCountSubmodulesToSyncMethod`
`257`	`257`	`{`
`258`	`258`	`[Fact] // WorkDirDeleted`
`259`	`259`	`public async Task CommittedSubmodule_True()`
`@@ -269,9 +269,9 @@ public async Task CommittedSubmodule_True()`
`269`	`269`	`var service = CreatePullRequestService(repo);`
`270`	`270`	`var repositoryModel = CreateLocalRepositoryModel(repo);`
`271`	`271`
`272`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`272`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`273`	`273`
`274`		`- Assert.True(isRequired);`
	`274`	`+ Assert.Equal(1, count);`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`@@ -292,9 +292,9 @@ public async Task UninitializedSubmodule_True()`
`292`	`292`	`var service = CreatePullRequestService(repo);`
`293`	`293`	`var repositoryModel = CreateLocalRepositoryModel(repo);`
`294`	`294`
`295`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`295`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`296`	`296`
`297`		`- Assert.True(isRequired);`
	`297`	`+ Assert.Equal(1, count);`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`@@ -316,9 +316,9 @@ public async Task ChangedSubmodule_True()`
`316`	`316`	`var service = CreatePullRequestService(repo);`
`317`	`317`	`var repositoryModel = CreateLocalRepositoryModel(repo);`
`318`	`318`
`319`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`319`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`320`	`320`
`321`		`- Assert.True(isRequired);`
	`321`	`+ Assert.Equal(1, count);`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`
`@@ -339,9 +339,9 @@ public async Task UpdatedSubmodule_False()`
`339`	`339`	`var service = CreatePullRequestService(repo);`
`340`	`340`	`var repositoryModel = CreateLocalRepositoryModel(repo);`
`341`	`341`
`342`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`342`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`343`	`343`
`344`		`- Assert.False(isRequired);`
	`344`	`+ Assert.Equal(0, count);`
`345`	`345`	`}`
`346`	`346`	`}`
`347`	`347`
`@@ -354,9 +354,9 @@ public async Task NewRepo_False()`
`354`	`354`	`var service = CreatePullRequestService(repo);`
`355`	`355`	`var repositoryModel = CreateLocalRepositoryModel(repo);`
`356`	`356`
`357`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`357`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`358`	`358`
`359`		`- Assert.False(isRequired);`
	`359`	`+ Assert.Equal(0, count);`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`
`@@ -371,9 +371,9 @@ public async Task UntrackedFile_False()`
`371`	`371`	`var file = Path.Combine(repo.Info.WorkingDirectory, "file.txt");`
`372`	`372`	`File.WriteAllText(file, "contents");`
`373`	`373`
`374`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`374`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`375`	`375`
`376`		`- Assert.False(isRequired);`
	`376`	`+ Assert.Equal(0, count);`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`
`@@ -390,9 +390,9 @@ public async Task CommitFile_False()`
`390`	`390`	`Commands.Stage(repo, file);`
`391`	`391`	`repo.Commit("foo", Author, Author);`
`392`	`392`
`393`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`393`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`394`	`394`
`395`		`- Assert.False(isRequired);`
	`395`	`+ Assert.Equal(0, count);`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`
`@@ -409,9 +409,9 @@ public async Task AddedFile_False()`
`409`	`409`	`File.WriteAllText(file, "contents");`
`410`	`410`	`Commands.Stage(repo, path);`
`411`	`411`
`412`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`412`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`413`	`413`
`414`		`- Assert.False(isRequired);`
	`414`	`+ Assert.Equal(0, count);`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`
`@@ -430,9 +430,9 @@ public async Task ModifiedFile_False()`
`430`	`430`	`repo.Commit("foo", Author, Author);`
`431`	`431`	`File.WriteAllText(file, "contents2");`
`432`	`432`
`433`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`433`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`434`	`434`
`435`		`- Assert.False(isRequired);`
	`435`	`+ Assert.Equal(0, count);`
`436`	`436`	`}`
`437`	`437`	`}`
`438`	`438`
`@@ -452,9 +452,9 @@ public async Task StagedFile_False()`
`452`	`452`	`File.WriteAllText(file, "contents2");`
`453`	`453`	`Commands.Stage(repo, path);`
`454`	`454`
`455`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`455`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`456`	`456`
`457`		`- Assert.False(isRequired);`
	`457`	`+ Assert.Equal(0, count);`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`
`@@ -473,9 +473,9 @@ public async Task MissingFile_False()`
`473`	`473`	`repo.Commit("foo", Author, Author);`
`474`	`474`	`File.Delete(file);`
`475`	`475`
`476`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`476`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`477`	`477`
`478`		`- Assert.False(isRequired);`
	`478`	`+ Assert.Equal(0, count);`
`479`	`479`	`}`
`480`	`480`	`}`
`481`	`481`
`@@ -495,9 +495,9 @@ public async Task RemovedFile_False()`
`495`	`495`	`File.Delete(file);`
`496`	`496`	`Commands.Stage(repo, path);`
`497`	`497`
`498`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`498`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`499`	`499`
`500`		`- Assert.False(isRequired);`
	`500`	`+ Assert.Equal(0, count);`
`501`	`501`	`}`
`502`	`502`	`}`
`503`	`503`
`@@ -520,9 +520,9 @@ public async Task RenamedInIndexFile_False()`
`520`	`520`	`Commands.Stage(repo, path);`
`521`	`521`	`Commands.Stage(repo, renamedPath);`
`522`	`522`
`523`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`523`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`524`	`524`
`525`		`- Assert.False(isRequired);`
	`525`	`+ Assert.Equal(0, count);`
`526`	`526`	`}`
`527`	`527`	`}`
`528`	`528`
`@@ -546,9 +546,9 @@ public async Task RenamedInWorkingDirFile_False()`
`546`	`546`	// NOTE: `RetrieveStatus(new StatusOptions { DetectRenamesInWorkDir = true })` would need to be used
`547`	`547`	// for renamed files to appear as `RenamedInWorkingDir` rather than `Missing` and `Untracked`.
`548`	`548`	`// This isn't required in the current implementation.`
`549`		`- var isRequired = await service.IsSyncSubmodulesRequired(repositoryModel).FirstAsync();`
	`549`	`+ var count = await service.CountSubmodulesToSync(repositoryModel).FirstAsync();`
`550`	`550`
`551`		`- Assert.False(isRequired);`
	`551`	`+ Assert.Equal(0, count);`
`552`	`552`	`}`
`553`	`553`	`}`
`554`	`554`	`}`