Skip to content

Commit

Permalink
branch: --no-optional-locks arg needs to be given to git
Browse files Browse the repository at this point in the history
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 <cb@256bit.org>
  • Loading branch information
chrisbra committed Oct 4, 2023
1 parent e6bb842 commit f1ba5a0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions autoload/airline/extensions/branch.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit f1ba5a0

Please sign in to comment.