AheadBehindDataProvider: Return null on non-zero git exit code

gitextensions · Jul 4, 2021 · 35632c7 · 35632c7
1 parent cb46c4d
commit 35632c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/GitCommands/Git/AheadBehindDataProvider.cs b/GitCommands/Git/AheadBehindDataProvider.cs
@@ -60,13 +60,13 @@ public AheadBehindDataProvider(Func<IExecutable> getGitExecutable)
                 "refs/heads/" + branchName
             };
 
-            var result = GetGitExecutable().GetOutput(aheadBehindGitCommand, outputEncoding: encoding);
-            if (string.IsNullOrEmpty(result))
+            ExecutionResult result = GetGitExecutable().Execute(aheadBehindGitCommand, outputEncoding: encoding);
+            if (!result.ExitedSuccessfully || string.IsNullOrEmpty(result.StandardOutput))
             {
                 return null;
             }
 
-            var matches = _aheadBehindRegEx.Matches(result);
+            var matches = _aheadBehindRegEx.Matches(result.StandardOutput);
             Dictionary<string, AheadBehindData> aheadBehindForBranchesData = new();
             foreach (Match match in matches)
             {

diff --git a/UnitTests/GitCommands.Tests/Git/AheadBehindDataProviderTests.cs b/UnitTests/GitCommands.Tests/Git/AheadBehindDataProviderTests.cs
@@ -36,7 +36,7 @@ public void Setup()
             _process.StandardError.Returns(x => _errorStreamReader);
 
             _executable = Substitute.For<IExecutable>();
-            _executable.Start(Arg.Any<ArgumentString>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<Encoding>()).Returns(x => _process);
+            _executable.Start(Arg.Any<ArgumentString>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<bool>(), Arg.Any<Encoding>(), Arg.Any<bool>()).Returns(x => _process);
 
             _provider = new AheadBehindDataProvider(() => _executable);
         }