From f1ba5a03db44adf6f95f08b9970019e6658bc748 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Wed, 4 Oct 2023 21:00:17 +0200 Subject: [PATCH] branch: --no-optional-locks arg needs to be given to git The special argument --no-optional-lock applies to the main git command, and not to the git subcommand `git status`. So move it there, to prevent an error with git. closes #2651 Signed-off-by: Christian Brabandt --- autoload/airline/extensions/branch.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim index 5cc235a1..cebb7007 100644 --- a/autoload/airline/extensions/branch.vim +++ b/autoload/airline/extensions/branch.vim @@ -17,8 +17,8 @@ scriptencoding utf-8 let s:vcs_config = { \ 'git': { \ 'exe': 'git', -\ 'cmd': 'git status --porcelain --no-optional-locks -- ', -\ 'dirty': 'git status -uno --porcelain --no-optional-locks --ignore-submodules', +\ 'cmd': 'git --no-optional-locks status --porcelain -- ', +\ 'dirty': 'git --no-optional-locks status -uno --porcelain --ignore-submodules', \ 'untracked_mark': '??', \ 'exclude': '\.git', \ 'update_branch': 's:update_git_branch',