Skip to content

Commit 5ad3d89

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

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

0 commit comments

Comments
 (0)