Skip to content

Commit a41b68a

Browse files
committed
fix: switch back from native rebase to custom for finding commits, again
actually no need to use native rebase for __finding__ the commits. for actually rebasing, we're already doing it w/ the native rebase. for finding commits, using the native rebase had various issues, it involved having to do other hacks & work-arounds, and in general didn't represent what we were actually doing, so e.g. could cause unwanted side-effects, e.g. by calling the post-rewrite hook, when it's not actually meant to. Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent ea6b2d6 commit a41b68a

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

git-stacked-rebase.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -440,18 +440,18 @@ export const gitStackedRebase = async (
440440
initialBranch,
441441
currentBranch,
442442
// __default__pathToStackedRebaseTodoFile
443-
pathToStackedRebaseTodoFile,
444-
() =>
445-
getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
446-
gitCmd: options.gitCmd,
447-
repo,
448-
initialBranch,
449-
currentBranch,
450-
dotGitDirPath,
451-
pathToRegularRebaseTodoFile,
452-
pathToStackedRebaseTodoFile,
453-
pathToRegularRebaseDirInsideDotGit,
454-
})
443+
pathToStackedRebaseTodoFile
444+
// () =>
445+
// getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
446+
// gitCmd: options.gitCmd,
447+
// repo,
448+
// initialBranch,
449+
// currentBranch,
450+
// dotGitDirPath,
451+
// pathToRegularRebaseTodoFile,
452+
// pathToStackedRebaseTodoFile,
453+
// pathToRegularRebaseDirInsideDotGit,
454+
// })
455455
);
456456

457457
if (!wasRegularRebaseInProgress || options.viewTodoOnly) {
@@ -1359,6 +1359,7 @@ export async function getWantedCommitsWithBranchBoundariesOurCustomImpl(
13591359
return extendCommitsWithBranchEnds(repo, bb, wantedCommits);
13601360
}
13611361

1362+
noop(getWantedCommitsWithBranchBoundariesUsingNativeGitRebase);
13621363
async function getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
13631364
gitCmd,
13641365
repo,

0 commit comments

Comments
 (0)