Skip to content

Commit 76b4b9d

Browse files
committed
stop using getWantedCommitsWithBranchBoundariesUsingNativeGitRebase
seems pointless & hacky to launch 2 rebases instead of findinf 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 dc27f3a commit 76b4b9d

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

git-stacked-rebase.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,19 +266,19 @@ export const gitStackedRebase = async (
266266
initialBranch,
267267
currentBranch,
268268
// __default__pathToStackedRebaseTodoFile
269-
pathToStackedRebaseTodoFile,
270-
() =>
271-
getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
272-
gitCmd: options.gitCmd,
273-
repo,
274-
initialBranch,
275-
currentBranch,
276-
dotGitDirPath,
277-
pathToRegularRebaseTodoFile,
278-
pathToStackedRebaseTodoFile,
279-
pathToRegularRebaseDirInsideDotGit,
280-
log,
281-
})
269+
pathToStackedRebaseTodoFile
270+
// () =>
271+
// getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
272+
// gitCmd: options.gitCmd,
273+
// repo,
274+
// initialBranch,
275+
// currentBranch,
276+
// dotGitDirPath,
277+
// pathToRegularRebaseTodoFile,
278+
// pathToStackedRebaseTodoFile,
279+
// pathToRegularRebaseDirInsideDotGit,
280+
// log,
281+
// })
282282
);
283283

284284
log("reading after internal rebase call");
@@ -983,6 +983,7 @@ async function getWantedCommitsWithBranchBoundariesOurCustomImpl(
983983
return extendCommitsWithBranchEnds(repo, bb, wantedCommits);
984984
}
985985

986+
noop(getWantedCommitsWithBranchBoundariesUsingNativeGitRebase);
986987
async function getWantedCommitsWithBranchBoundariesUsingNativeGitRebase({
987988
gitCmd,
988989
repo,

0 commit comments

Comments
 (0)