Skip to content

Commit 365ae80

Browse files
authored
Fix NRE when localpath was null (#5941)
1 parent bd95817 commit 365ae80

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Microsoft.DotNet.Darc/DarcLib/Remote.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,11 +457,11 @@ public async Task<List<GitFile>> GetCommonScriptFilesAsync(
457457
LocalPath baseDirectory = null,
458458
bool stripBaseDirectory = false)
459459
{
460-
string path = baseDirectory == null
461-
? Constants.CommonScriptFilesPath
462-
: baseDirectory / Constants.CommonScriptFilesPath;
460+
baseDirectory = baseDirectory ?? UnixPath.Empty;
463461

464-
List<GitFile> files = await _remoteGitClient.GetFilesAtCommitAsync(repoUri, commit, path);
462+
string commonScriptsPath = baseDirectory / Constants.CommonScriptFilesPath;
463+
464+
List<GitFile> files = await _remoteGitClient.GetFilesAtCommitAsync(repoUri, commit, commonScriptsPath);
465465

466466
if (stripBaseDirectory)
467467
{
@@ -474,10 +474,10 @@ public async Task<List<GitFile>> GetCommonScriptFilesAsync(
474474
}
475475

476476
_logger.LogInformation("Fetched common script files from repo {RepoUri} at commit {Commit}, "
477-
+ "at relative path {RelativeBasePath}",
477+
+ "at path {CommonScriptsPath}",
478478
repoUri,
479479
commit,
480-
baseDirectory);
480+
commonScriptsPath);
481481

482482
return files;
483483
}

0 commit comments

Comments
 (0)