Skip to content

Commit afb90de

Browse files
committed
fix w/ latest branch being everywhere
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent 87bad76 commit afb90de

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

git-stacked-rebase.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,11 +1440,12 @@ async function extendCommitsWithBranchEnds(
14401440
.replace(removeLocalRegex, "")
14411441
.replace(removeRemoteRegex, "")
14421442
)
1443-
).length === 1) ||
1444-
/**
1445-
* or, if it's the root branch
1446-
*/
1447-
!c.id().cmp(currentBranchCommit),
1443+
).length === 1),
1444+
// ||
1445+
// /**
1446+
// * or, if it's the root branch
1447+
// */
1448+
// !c.id().cmp(currentBranchCommit),
14481449
"" +
14491450
"2 (or more) branches for the same commit, both in the same path - cannot continue" +
14501451
"(until explicit branch specifying is implemented)" +

0 commit comments

Comments
 (0)