kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-08-15 18:20:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #294 from bezbac/develop

Browse Source 
Improve `magit-branch-spinoff` implementation
This commit is contained in:
Kristian Andersen Hole 2024-04-03 16:55:24 +02:00 committed by GitHub
commit dd36f9e471
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/commands/branchingCommands.ts
View File

@ -207,13 +207,59 @@ async function createNewSpinoff({ repository }: MenuState) {
prompt: 'Name for new branch',
});
if (newBranchName && newBranchName.length > 0) {
const args = ['checkout', '-B', newBranchName];
return gitRun(repository.gitRepository, args);
} else {
window.setStatusBarMessage(
if (!newBranchName || newBranchName.length < 1) {
return window.setStatusBarMessage(
'No name given for new branch',
Constants.StatusMessageDisplayTimeout
);
}
if (repository.branches.find(b => b.name === newBranchName)) {
return window.setStatusBarMessage(
`Cannot spin off ${newBranchName}. It already exists`,
Constants.StatusMessageDisplayTimeout
);
}
const base = repository.HEAD?.name;
if (!base) {
return window.setStatusBarMessage(
'No branch checked out',
Constants.StatusMessageDisplayTimeout
);
}
// Save current commit hash of base branch for later reference
const baseCommit = repository.HEAD?.commit;
// Get upsteam branch commit hash of base branch
const upstreamBranchCommit = repository.HEAD.upstreamRemote?.commit?.hash;
// Checkout new branch
await gitRun(repository.gitRepository, ['checkout', '-b', newBranchName]);
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 ${mergeBase}`,
Constants.StatusMessageDisplayTimeout
);
} else {
window.setStatusBarMessage(
`Branch ${base} not changed`,
Constants.StatusMessageDisplayTimeout
);
}
}