Skip to content

Commit c6e9082

Browse files
committed
no longer use native rebase to find commits
seems pointless & hacky to launch 2 rebases instead of finding the commits ourselves & then only launching the rebase when appropriate to do the actual rebasing. because of stuff like hooks etc., it just doesn't feel right. i don't know if there's stuff we're missing out on that native rebase is better at, esp. w/ edge cases, but i suppose we'll have to find out. Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent 648831c commit c6e9082

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
@@ -258,18 +258,18 @@ export const gitStackedRebase = async (
258258
initialBranch,
259259
currentBranch,
260260
// __default__pathToStackedRebaseTodoFile
261-
pathToStackedRebaseTodoFile,
262-
() =>
263-
getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
264-
gitCmd: options.gitCmd,
265-
repo,
266-
initialBranch,
267-
currentBranch,
268-
dotGitDirPath,
269-
pathToRegularRebaseTodoFile,
270-
pathToStackedRebaseTodoFile,
271-
pathToRegularRebaseDirInsideDotGit,
272-
})
261+
pathToStackedRebaseTodoFile
262+
// () =>
263+
// getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
264+
// gitCmd: options.gitCmd,
265+
// repo,
266+
// initialBranch,
267+
// currentBranch,
268+
// dotGitDirPath,
269+
// pathToRegularRebaseTodoFile,
270+
// pathToStackedRebaseTodoFile,
271+
// pathToRegularRebaseDirInsideDotGit,
272+
// })
273273
);
274274

275275
if (!wasRegularRebaseInProgress || options.viewTodoOnly) {
@@ -979,6 +979,7 @@ async function getWantedCommitsWithBranchBoundariesOurCustomImpl(
979979
return extendCommitsWithBranchEnds(repo, bb, wantedCommits);
980980
}
981981

982+
noop(getWantedCommitsWithBranchBoundariesUsingNativeGitRebase);
982983
async function getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
983984
gitCmd,
984985
repo,

0 commit comments

Comments
 (0)