From 8e90d82eb4f4bd71de1dafd5f3ae4bfaca1a79bd Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sat, 1 Feb 2020 10:49:35 -0500
Subject: [PATCH] Use --no-optional-locks for :Gstatus

This clears up some intermittent errors during :Git rebase, although I
must admit I don't really understand why, as the status reload shouldn't
be happening at the same time :Git is running.
---
 autoload/fugitive.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 2d7c21c..622b9ee 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1680,6 +1680,10 @@ function! fugitive#BufReadStatus() abort
       let cmd += ['-c', 'GIT_INDEX_FILE=' . amatch]
     endif
 
+    if fugitive#GitVersion(2, 15)
+      call add(cmd, '--no-optional-locks')
+    endif
+
     let b:fugitive_files = {'Staged': {}, 'Unstaged': {}}
     let [staged, unstaged, untracked] = [[], [], []]
     let props = {}