Skip to content

Commit 181ad58

Browse files
authored
Merge pull request #205 from rainersigwald/fix-nbgv-get-commits
Allow repo-root CWD for nbgv get-commits
2 parents 7827ebe + 5a7521c commit 181ad58

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/nbgv/Program.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,14 +539,24 @@ private static async Task<string> GetLatestPackageVersionAsync(string packageId,
539539

540540
private static string GetSpecifiedOrCurrentDirectoryPath(string versionJsonRoot)
541541
{
542-
return Path.GetFullPath(string.IsNullOrEmpty(versionJsonRoot) ? "." : versionJsonRoot);
542+
return ShouldHaveTrailingDirectorySeparator(Path.GetFullPath(string.IsNullOrEmpty(versionJsonRoot) ? "." : versionJsonRoot));
543543
}
544544

545545
private static string GetRepoRelativePath(string searchPath, LibGit2Sharp.Repository repository)
546546
{
547547
return searchPath.Substring(repository.Info.WorkingDirectory.Length);
548548
}
549549

550+
private static string ShouldHaveTrailingDirectorySeparator(string path)
551+
{
552+
if (path.EndsWith(Path.DirectorySeparatorChar) || path.EndsWith(Path.AltDirectorySeparatorChar))
553+
{
554+
return path;
555+
}
556+
557+
return path + Path.DirectorySeparatorChar;
558+
}
559+
550560
private static void PrintCommits(bool quiet, string projectDirectory, LibGit2Sharp.Repository repository, List<LibGit2Sharp.Commit> candidateCommits, bool includeOptions = false)
551561
{
552562
int index = 1;

0 commit comments

Comments
 (0)