From 63c1ea1cd5141a150937091d104bc92b1257ad79 Mon Sep 17 00:00:00 2001 From: Kristian Andersen Hole Date: Tue, 23 Jan 2024 13:40:18 +0100 Subject: [PATCH] adds no verify to merge commit --- src/commands/mergingCommands.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/commands/mergingCommands.ts b/src/commands/mergingCommands.ts index 5b6eaa0..650342a 100644 --- a/src/commands/mergingCommands.ts +++ b/src/commands/mergingCommands.ts @@ -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); } -} \ No newline at end of file +}