merge-base: Add a case for Parent + child

GitJournal · Dec 14, 2023 · 2ca0f3e · 2ca0f3e
1 parent 9b3f4a1
commit 2ca0f3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/merge_base.dart b/lib/merge_base.dart
@@ -106,8 +106,7 @@ extension MergeBase on GitRepository {
         });
 
         if (commits.length == 1) {
-          // FIXME: Wtf? Where are we stopping?
-          throw Exception('Stop?');
+          break;
         }
 
         seen.add(fromAncestor.hash);

diff --git a/test/merge_base_test.dart b/test/merge_base_test.dart
@@ -101,6 +101,7 @@ var independentData = [
   Test(['C', 'G', 'dev', 'M', 'N'], ['C', 'G', 'dev'], 'AcrossCrossMerges'),
   Test(['A', 'A^', 'A', 'M', 'N'], ['A', 'N'], 'ChangingOrderRepetition'),
   Test(['A^^^', 'A^', 'A^^', 'A', 'N'], ['A', 'N'], 'ChangingOrder'),
+  Test(['A', 'CD1'], ['CD1'], 'ParentChild'),
 ];
 
 class ATest {