Skip to content

Commit 5864950

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

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
@@ -1422,11 +1422,12 @@ async function extendCommitsWithBranchEnds(
14221422
.replace(removeLocalRegex, "")
14231423
.replace(removeRemoteRegex, "")
14241424
)
1425-
).length === 1) ||
1426-
/**
1427-
* or, if it's the root branch
1428-
*/
1429-
!c.id().cmp(currentBranchCommit),
1425+
).length === 1),
1426+
// ||
1427+
// /**
1428+
// * or, if it's the root branch
1429+
// */
1430+
// !c.id().cmp(currentBranchCommit),
14301431
"" +
14311432
"2 (or more) branches for the same commit, both in the same path - cannot continue" +
14321433
"(until explicit branch specifying is implemented)" +

0 commit comments

Comments
 (0)