Merge branch 'devel'

kekyo · Jun 23, 2023 · f6ce263 · f6ce263
2 parents 79a0959 + 065e2f8
commit f6ce263
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/CenterCLR.RelaxVersioner.Core/CenterCLR.RelaxVersioner.Core.csproj b/CenterCLR.RelaxVersioner.Core/CenterCLR.RelaxVersioner.Core.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitReader" Version="0.12.0" />
+    <PackageReference Include="GitReader" Version="0.13.0" />
     <PackageReference Include="NamingFormatter" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="all" />
+    <PackageReference Include="RelaxVersioner" Version="2.15.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CenterCLR.RelaxVersioner.Core/Processor.cs b/CenterCLR.RelaxVersioner.Core/Processor.cs
@@ -89,7 +89,8 @@ private static async Task<Result> WriteVersionSourceFileAsync(
             await targetBranch.GetHeadCommitAsync(ct) :
             null;
 
-        var commitId = commit?.Hash.ToString() ?? string.Empty;
+        var commitId = commit?.Hash.ToString() ??
+            "unknown";
 
         static string FormatSignature(Signature? sig) => sig is { } s ?
             (s.MailAddress is { } ma ? $"{s.Name} <{ma}>" : s.Name) :
@@ -168,13 +169,13 @@ static string FormatSignature(Signature? sig) => sig is { } s ?
             intDateVersion,
             epochIntDateVersion,
             commitId,
-            targetBranch.Name,
+            targetBranch?.Name,
             tags,
             commitDate,
             author,
             committer,
-            commit.Subject,
-            commit.Body);
+            commit?.Subject,
+            commit?.Body);
     }
 
     public async Task<Result> RunAsync(
@@ -200,7 +201,7 @@ public async Task<Result> RunAsync(
                 logger,
                 writer,
                 context,
-                repository.Head,
+                repository?.Head,
                 DateTimeOffset.Now,
                 ruleSet,
                 importSet,

diff --git a/CenterCLR.RelaxVersioner.Tasks/CenterCLR.RelaxVersioner.Tasks.csproj b/CenterCLR.RelaxVersioner.Tasks/CenterCLR.RelaxVersioner.Tasks.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="all" />
+    <PackageReference Include="RelaxVersioner" Version="2.15.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/CenterCLR.RelaxVersioner/CenterCLR.RelaxVersioner.csproj b/CenterCLR.RelaxVersioner/CenterCLR.RelaxVersioner.csproj
@@ -28,7 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="all" />
+    <PackageReference Include="RelaxVersioner" Version="2.15.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/README.ja.md b/README.ja.md
@@ -454,6 +454,8 @@ nuspecファイルを使ってパッケージを生成する場合は、デフ
 
 ## 履歴
 
+* 2.16.0:
+  * 初期化されていない Git リポジトリで NRE が発生する問題を修正。
 * 2.15.0:
   * Gitリポジトリの読み取りを、libgit2sharp から [GitReader](https://github.com/kekyo/GitReader) に変更しました。
     ネイティブライブラリに依存しなくなったため、動作環境の制限が緩和されます。

diff --git a/README.md b/README.md
@@ -435,6 +435,8 @@ When you are using a nuspec file to generate a NuGet package, there are addition
 
 ## History
 
+* 2.16.0:
+  * Fixed causing NRE on uninitialized git repository.
 * 2.15.0:
   * Changed reading of Git repositories using [GitReader](https://github.com/kekyo/GitReader) instead of libgit2sharp.
     The native library no longer depends on it, which eases the limitation of the operating environment.