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 switch to merging commands

Browse Source
This commit is contained in:
Kristian Andersen Hole 2024-01-18 22:23:52 +01:00
parent 3f66cd1cb5
commit 12617656c6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands/branchingCommands.ts
View File

@ -1,3 +1,4 @@
import * as Constants from '../common/constants';
import { ViewColumn, window } from 'vscode';
import { MenuState, MenuUtil } from '../menu/menu';
import { PickMenuUtil } from '../menu/pickMenu';
@ -195,7 +196,8 @@ async function _createBranch({ repository }: MenuState, checkout: boolean) {
return gitRun(repository.gitRepository, args);
} else {
throw new Error('No name given for new branch');
window.setStatusBarMessage('No name given for new branch', Constants.StatusMessageDisplayTimeout);
}
}
}

1
src/commands/mergingCommands.ts
View File

@ -29,6 +29,7 @@ export async function merging(repository: MagitRepository) {
const switches = [
{ key: '-f', name: '--ff-only', description: 'Fast-forward only' },
{ key: '-n', name: '--no-ff', description: 'No fast-forward' },
{ key: '-n', name: '--no-verify', description: 'Disable hooks' },
];
if (repository.mergingState) {