Skip to content

Commit e24514c

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

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
@@ -1330,11 +1330,12 @@ async function extendCommitsWithBranchEnds(
13301330
.replace(removeLocalRegex, "")
13311331
.replace(removeRemoteRegex, "")
13321332
)
1333-
).length === 1) ||
1334-
/**
1335-
* or, if it's the root branch
1336-
*/
1337-
!c.id().cmp(currentBranchCommit),
1333+
).length === 1),
1334+
// ||
1335+
// /**
1336+
// * or, if it's the root branch
1337+
// */
1338+
// !c.id().cmp(currentBranchCommit),
13381339
"" +
13391340
"2 (or more) branches for the same commit, both in the same path - cannot continue" +
13401341
"(until explicit branch specifying is implemented)" +

0 commit comments

Comments
 (0)