Merge pull request #214 from grodowski/handle-grafted-commits

Handle nil merge_base in Changeset
grodowski · Dec 3, 2024 · ee5c808 · ee5c808
2 parents 036dd0a + 31fbda6
commit ee5c808
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/undercover/changeset.rb b/lib/undercover/changeset.rb
@@ -74,7 +74,9 @@ def full_diff
     def compare_base_obj
       return nil unless compare_base
 
-      repo.lookup(repo.merge_base(compare_base.to_s, head))
+      merge_base = repo.merge_base(compare_base.to_s, head)
+      # merge_base may be nil with --depth 1, compare two refs directly
+      merge_base ? repo.lookup(merge_base) : repo.rev_parse(compare_base)
     end
 
     def head