Skip to content

Commit 3bd1e34

Browse files
committed
Fixed possible null reference exception, fixes #1022
1 parent 5dce5c1 commit 3bd1e34

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/GitVersionCore/GitVersionCacheKeyFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private static List<string> CalculateDirectoryContents(string root)
7979
continue;
8080
}
8181

82-
string[] files = null;
82+
string[] files;
8383
try
8484
{
8585
files = Directory.GetFiles(currentDir);

src/GitVersionCore/LibGitExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static Commit FindCommitBranchWasBranchedFrom([NotNull] this Branch branc
6868
mergeBaseCommit = findMergeBase,
6969
branch = otherBranch
7070
};
71-
}).Where(b => b != null).OrderByDescending(b => b.mergeBaseCommit.Committer.When).ToList();
71+
}).Where(b => b.mergeBaseCommit != null).OrderByDescending(b => b.mergeBaseCommit.Committer.When).ToList();
7272

7373
var firstOrDefault = mergeBases.FirstOrDefault();
7474
if (firstOrDefault != null)

0 commit comments

Comments
 (0)