Skip to content

Commit 2ca0f3e

Browse files
committed
merge-base: Add a case for Parent + child
1 parent 9b3f4a1 commit 2ca0f3e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/merge_base.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ extension MergeBase on GitRepository {
106106
});
107107

108108
if (commits.length == 1) {
109-
// FIXME: Wtf? Where are we stopping?
110-
throw Exception('Stop?');
109+
break;
111110
}
112111

113112
seen.add(fromAncestor.hash);

test/merge_base_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ var independentData = [
101101
Test(['C', 'G', 'dev', 'M', 'N'], ['C', 'G', 'dev'], 'AcrossCrossMerges'),
102102
Test(['A', 'A^', 'A', 'M', 'N'], ['A', 'N'], 'ChangingOrderRepetition'),
103103
Test(['A^^^', 'A^', 'A^^', 'A', 'N'], ['A', 'N'], 'ChangingOrder'),
104+
Test(['A', 'CD1'], ['CD1'], 'ParentChild'),
104105
];
105106

106107
class ATest {

0 commit comments

Comments
 (0)