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

adds no verify to merge commit

Browse Source
This commit is contained in:
Kristian Andersen Hole 2024-01-23 13:40:18 +01:00
parent cc51974ce9
commit 63c1ea1cd5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/mergingCommands.ts
View File

@ -31,11 +31,14 @@ export async function merging(repository: MagitRepository) {
{ key: '-n', name: '--no-ff', description: 'No fast-forward' },
{ key: '-n', name: '--no-verify', description: 'Disable hooks' },
];
const whileMergingSwitches = [
{ key: '-n', name: '--no-verify', description: 'Disable hooks' },
];
if (repository.mergingState) {
return MenuUtil.showMenu(whileMergingMenu, { repository });
return MenuUtil.showMenu(whileMergingMenu, { repository, switches });
} else {
return MenuUtil.showMenu(mergingMenu, { repository, switches });
return MenuUtil.showMenu(mergingMenu, { repository, switches: whileMergingSwitches });
}
}
@ -117,4 +120,4 @@ async function abortMerge({ repository }: MenuState) {
const args = ['merge', '--abort'];
return gitRun(repository.gitRepository, args);
}
}
}