kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-07-14 10:30:24 +03:00
Code Issues Projects Releases Wiki Activity

address pr comments

Browse Source
This commit is contained in:
Ben Bachem 2024-03-29 15:04:23 +01:00
parent dc5cd8ddf7
commit e0faf63d85
No known key found for this signature in database
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/branchingCommands.ts
View File

@ -239,11 +239,21 @@ async function createNewSpinoff({ repository }: MenuState) {
// Checkout new branch
await gitRun(repository.gitRepository, ['checkout', '-b', newBranchName]);
if (upstreamBranchCommit && baseCommit !== upstreamBranchCommit) {
await gitRun(repository.gitRepository, ['branch', '-f', base, upstreamBranchCommit]);
if (baseCommit && upstreamBranchCommit && baseCommit !== upstreamBranchCommit) {
// Find common ancestor of base branch and upstream branch
const mergeBase = await repository.gitRepository.getMergeBase(baseCommit, upstreamBranchCommit);
// Reset the original branch to the common ancestor
await gitRun(repository.gitRepository, [
'update-ref',
'-m',
`"reset: moving to ${mergeBase}"`,
`refs/heads/${base}`,
mergeBase
]);
window.setStatusBarMessage(
`Branch ${base} was reset to upstream`,
`Branch ${base} was reset to ${mergeBase}`,
Constants.StatusMessageDisplayTimeout
);
} else {