Fix race conditions generating sequencer sections

Resolves: https://github.com/tpope/vim-fugitive/issues/2411

doc/fugitive.txt

@@ -18,6 +18,12 @@ that are part of Git repositories).
                                                 *fugitive-:G*
 :G [args]               Same as :Git, but two characters shorter.
 
+                                                *fugitive-summary*
+:Git                    With no arguments, bring up a summary window vaguely
+                        akin to git-status.  If a summary window is already
+                        open for the current repository, it is focused
+                        instead.  Press g?  or see |fugitive-maps| for usage.
+
                                                 *:Git*
 :Git {args}             Run an arbitrary git command and display any output.
                         On UNIX this uses a pty and on other platforms it uses
@@ -47,11 +53,6 @@ that are part of Git repositories).
 :{range}Git! -p {args}  Run an arbitrary git command, and insert the output
                         after {range} in the current buffer.
 
-                                                *fugitive-summary*
-:Git                    With no arguments, bring up a summary window vaguely
-                        akin to git-status.  Press g? or see |fugitive-maps|
-                        for usage.
-
                                                 *:Git_blame*
 :Git blame [flags]      Run git-blame [flags] on the current file and open the
                         results in a scroll-bound vertical split.  The
@@ -70,12 +71,20 @@ that are part of Git repositories).
                         O     jump to patch or blob in new tab
                         p     jump to patch or blob in preview window
                         -     reblame at commit
-                        ~     reblame at commit~[count]
-                        P     reblame at commit^[count]
+
+                        The maps |fugitive_P| and |fugitive_~| are also
+                        supported to reblame on a parent commit, but this is
+                        inherently fragile, as the line being blamed will no
+                        longer exist.  The preferred alternative is to use
+                        <CR> to open up the commit, select the corresponding
+                        `-` line that you care about, and press <CR> twice
+                        more to reblame at that line.  Viewing the commit also
+                        gives you additional context as to why the line
+                        changed.
 
                                                 *g:fugitive_dynamic_colors*
                         In the GUI or a 256 color terminal, commit hashes will
-                        highlighted in different colors. To disable this:
+                        be highlighted in different colors. To disable this:
 >
                         let g:fugitive_dynamic_colors = 0
 <
@@ -157,6 +166,9 @@ plus |:grep|.
                                                 *:Gpedit*
 :Gpedit [object]        |:pedit| a |fugitive-object|.
 
+                                                *:Gdrop*
+:Gdrop [object]         |:drop| a |fugitive-object|.
+
                                                 *:Gread* *fugitive-:Gr*
 :Gread [object]         Empty the buffer and |:read| a |fugitive-object|.
                         When the argument is omitted, this is similar to
@@ -165,12 +177,6 @@ plus |:grep|.
 
 :{range}Gread [object]  |:read| in a |fugitive-object| after {range}.
 
-                                                *:Gread!* *fugitive-:Gr!*
-:Gread! [args]          Empty the buffer and |:read| the output of a Git
-                        command.  For example, :Gread! show HEAD:%.
-
-:{range}Gread! [args]   |:read| the output of a Git command after {range}.
-
                                                 *:Gwrite* *fugitive-:Gw*
 :Gwrite                 Write to the current file's path and stage the results.
                         When run in a work tree file, it is effectively git
@@ -335,8 +341,8 @@ ds                      Perform a |:Ghdiffsplit| on the file under the cursor.
 dh
 
                                                 *fugitive_dq*
-dq                      Close all but one diff buffer, and |:diffoff|! the
-                        last one.
+dq                      Close all but the currently focused diff buffer, and
+                        invoke |:diffoff|!.
 
                                                 *fugitive_d?*
 d?                      Show this help.
@@ -374,6 +380,9 @@ p                       Open the file or |fugitive-object| under the cursor in
 
                                                 *fugitive_P*
 P                       Open the current file in the [count]th parent.
+                        Experimental:  In the "Unpushed" section of the status
+                        buffer, this will populate the command line with a
+                        ":Git push" command for the commit under the cursor.
 
                                                 *fugitive_C*
 C                       Open the commit containing the current file.
@@ -456,15 +465,18 @@ Commit maps ~
 
 cc                      Create a commit.
 
+cvc                     Create a commit with -v.
+
 ca                      Amend the last commit and edit the message.
 
+cva                     Amend the last commit with -v.
+
 ce                      Amend the last commit without editing the message.
 
 cw                      Reword the last commit.
 
-cvc                     Create a commit with -v.
-
-cva                     Amend the last commit with -v
+cW                      Create an `amend!` commit that rewords the commit
+                        under the cursor.
 
 cf                      Create a `fixup!` commit for the commit under the
                         cursor.
@@ -478,8 +490,8 @@ cs                      Create a `squash!` commit for the commit under the
 cS                      Create a `squash!` commit for the commit under the
                         cursor and immediately rebase it.
 
-cA                      Create a `squash!` commit for the commit under the
-                        cursor and edit the message.
+cn                      Create a `squash!` commit for the commit under the
+(formerly cA)           cursor and edit the message.
 
 c<Space>                Populate command line with ":Git commit ".
 
@@ -515,9 +527,11 @@ Stash maps ~
 czz                     Push stash.  Pass a [count] of 1 to add
                         `--include-untracked` or 2 to add `--all`.
 
-czw                     Push stash of worktree.  Like `czz` with
+czw                     Push stash of the work-tree.  Like `czz` with
                         `--keep-index`.
 
+czs                     Push stash of the stage.  Does not accept a count.
+
 czA                     Apply topmost stash, or stash@{count}.
 
 cza                     Apply topmost stash, or stash@{count}, preserving the
@@ -718,7 +732,7 @@ version.
 
                                                 *User_Fugitive*
 Fugitive used to support `:autocmd User Fugitive` to run an autocommand after
-loading any buffer belonging to a Git repository, but this is being phased
+loading any buffer belonging to a Git repository, but this has been phased
 out.  Instead, one can leverage regular autocommand events like |BufNewFile|
 and |BufReadPost|, and check !empty(FugitiveGitDir()) to confirm Fugitive has
 found a repository.  See also |fugitive-autocommands| for other, more

plugin/fugitive.vim

@@ -16,14 +16,14 @@ let s:bad_git_dir = '/$\|^fugitive:'
 " Fugitive is active in the current buffer.  Do not rely on this for direct
 " filesystem access; use FugitiveFind('.git/whatever') instead.
 function! FugitiveGitDir(...) abort
-  if v:version < 703
+  if v:version < 704
     return ''
   elseif !a:0 || type(a:1) == type(0) && a:1 < 0 || a:1 is# get(v:, 'true', -1)
     if exists('g:fugitive_event')
       return g:fugitive_event
     endif
     let dir = get(b:, 'git_dir', '')
-    if empty(dir) && (empty(bufname('')) || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|terminal\|prompt\)$')
+    if empty(dir) && (empty(bufname('')) && &filetype !=# 'netrw' || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|terminal\|prompt\)$')
       return FugitiveExtractGitDir(getcwd())
     elseif (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && &buftype =~# '^\%(nowrite\)\=$'
       let b:git_dir = FugitiveExtractGitDir(bufnr(''))
@@ -39,7 +39,7 @@ function! FugitiveGitDir(...) abort
   elseif type(a:1) == type('')
     return substitute(s:Slash(a:1), '/$', '', '')
   elseif type(a:1) == type({})
-    return get(a:1, 'git_dir', '')
+    return get(a:1, 'fugitive_dir', get(a:1, 'git_dir', ''))
   else
     return ''
   endif
@@ -91,12 +91,11 @@ function! FugitiveParse(...) abort
   if path !~# '^fugitive://'
     return ['', '']
   endif
-  let vals = matchlist(path, s:dir_commit_file)
-  if len(vals)
-    return [(vals[2] =~# '^.\=$' ? ':' : '') . vals[2] . substitute(vals[3], '^/', ':', ''), vals[1]]
+  let [rev, dir] = fugitive#Parse(path)
+  if !empty(dir)
+    return [rev, dir]
   endif
-  let v:errmsg = 'fugitive: invalid Fugitive URL ' . path
-  throw v:errmsg
+  throw 'fugitive: invalid Fugitive URL ' . path
 endfunction
 
 " FugitiveGitVersion() queries the version of Git in use.  Pass up to 3
@@ -141,7 +140,7 @@ function! FugitiveExecute(args, ...) abort
   return call('fugitive#Execute', [a:args] + a:000)
 endfunction
 
-" FugitiveShellCommand() turns an array of arugments into a Git command string
+" FugitiveShellCommand() turns an array of arguments into a Git command string
 " which can be executed with functions like system() and commands like :!.
 " Integer arguments will be treated as buffer numbers, and the appropriate
 " relative path inserted in their place.
@@ -152,19 +151,6 @@ function! FugitiveShellCommand(...) abort
   return call('fugitive#ShellCommand', a:000)
 endfunction
 
-" FugitivePrepare() is a deprecated alias for FugitiveShellCommand().  If you
-" are using this in conjunction with system(), consider using
-" FugitiveExecute() instead.
-function! FugitivePrepare(...) abort
-  if !exists('s:did_prepare_warning')
-    let s:did_prepare_warning = 1
-    echohl WarningMsg
-    unsilent echomsg 'FugitivePrepare() has been superseded by FugitiveShellCommand()'
-    echohl NONE
-  endif
-  return call('fugitive#ShellCommand', a:000)
-endfunction
-
 " FugitiveConfig() get returns an opaque structure that can be passed to other
 " FugitiveConfig functions in lieu of a Git directory.  This can be faster
 " when performing multiple config queries.  Do not rely on the internal
@@ -182,7 +168,7 @@ endfunction
 " argument can be either the object returned by FugitiveConfig(), or a Git
 " dir or buffer number to be passed along to FugitiveConfig().
 function! FugitiveConfigGet(name, ...) abort
-  return get(call('FugitiveConfigGetAll', [a:name] + (a:0 ? [a:1] : [])), 0, get(a:, 2, ''))
+  return get(call('FugitiveConfigGetAll', [a:name] + (a:0 ? [a:1] : [])), -1, get(a:, 2, ''))
 endfunction
 
 " FugitiveConfigGetAll() is like FugitiveConfigGet() but returns a list of
@@ -283,8 +269,16 @@ function! FugitiveStatusline(...) abort
   return fugitive#Statusline()
 endfunction
 
+let s:resolved_git_dirs = {}
 function! FugitiveActualDir(...) abort
-  return call('FugitiveGitDir', a:000)
+  let dir = call('FugitiveGitDir', a:000)
+  if empty(dir)
+    return ''
+  endif
+  if !has_key(s:resolved_git_dirs, dir)
+    let s:resolved_git_dirs[dir] = s:ResolveGitDir(dir)
+  endif
+  return empty(s:resolved_git_dirs[dir]) ? dir : s:resolved_git_dirs[dir]
 endfunction
 
 let s:commondirs = {}
@@ -344,12 +338,12 @@ endfunction
 let s:worktree_for_dir = {}
 let s:dir_for_worktree = {}
 function! s:Tree(path) abort
-  let dir = a:path
-  if dir =~# '/\.git$'
-    return len(dir) ==# 5 ? '/' : dir[0:-6]
-  elseif dir ==# ''
+  if a:path =~# '/\.git$'
+    return len(a:path) ==# 5 ? '/' : a:path[0:-6]
+  elseif a:path ==# ''
     return ''
   endif
+  let dir = FugitiveActualDir(a:path)
   if !has_key(s:worktree_for_dir, dir)
     let s:worktree_for_dir[dir] = ''
     let ext_wtc_pat = 'v:val =~# "^\\s*worktreeConfig *= *\\%(true\\|yes\\|on\\|1\\) *$"'
@@ -408,16 +402,37 @@ function! s:CeilingDirectories() abort
   return s:ceiling_directories + get(g:, 'ceiling_directories', [s:Slash(fnamemodify(expand('~'), ':h'))])
 endfunction
 
+function! s:ResolveGitDir(git_dir) abort
+  let type = getftype(a:git_dir)
+  if type ==# 'dir' && FugitiveIsGitDir(a:git_dir)
+    return a:git_dir
+  elseif type ==# 'link' && FugitiveIsGitDir(a:git_dir)
+    return resolve(a:git_dir)
+  elseif type !=# ''
+    let line = get(s:ReadFile(a:git_dir, 1), 0, '')
+    let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
+    if file_dir !~# '^/\|^\a:\|^$' && a:git_dir =~# '/\.git$' && FugitiveIsGitDir(a:git_dir[0:-5] . file_dir)
+      return simplify(a:git_dir[0:-5] . file_dir)
+    elseif file_dir =~# '^/\|^\a:' && FugitiveIsGitDir(file_dir)
+      return file_dir
+    endif
+  endif
+  return ''
+endfunction
+
 function! FugitiveExtractGitDir(path) abort
   if type(a:path) ==# type({})
-    return get(a:path, 'git_dir', '')
+    return get(a:path, 'fugitive_dir', get(a:path, 'git_dir', ''))
   elseif type(a:path) == type(0)
     let path = s:Slash(a:path > 0 ? bufname(a:path) : bufname(''))
+    if getbufvar(a:path, '&filetype') ==# 'netrw'
+      let path = s:Slash(getbufvar(a:path, 'netrw_curdir', path))
+    endif
   else
     let path = s:Slash(a:path)
   endif
   if path =~# '^fugitive://'
-    return get(matchlist(path, s:dir_commit_file), 1, '')
+    return fugitive#Parse(path)[1]
   elseif empty(path)
     return ''
   endif
@@ -440,20 +455,12 @@ function! FugitiveExtractGitDir(path) abort
       return s:dir_for_worktree[root]
     endif
     let dir = substitute(root, '[\/]$', '', '') . '/.git'
-    let type = getftype(dir)
-    if type ==# 'dir' && FugitiveIsGitDir(dir)
-      return dir
-    elseif type ==# 'link' && FugitiveIsGitDir(dir)
-      return resolve(dir)
-    elseif type !=# ''
-      let line = get(s:ReadFile(dir, 1), 0, '')
-      let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
-      if file_dir !~# '^/\|^\a:\|^$' && FugitiveIsGitDir(root . '/' . file_dir)
-        return simplify(root . '/' . file_dir)
-      elseif len(file_dir) && FugitiveIsGitDir(file_dir)
-        return file_dir
-      endif
+    let resolved = s:ResolveGitDir(dir)
+    if !empty(resolved)
+      let s:resolved_git_dirs[dir] = resolved
+      return dir is# resolved || s:Tree(resolved) is# 0 ? dir : resolved
     elseif FugitiveIsGitDir(root)
+      let s:resolved_git_dirs[root] = root
       return root
     endif
     let previous = root
@@ -463,34 +470,15 @@ function! FugitiveExtractGitDir(path) abort
 endfunction
 
 function! FugitiveDetect(...) abort
-  if v:version < 703
+  if v:version < 704
     return ''
   endif
   if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
     unlet b:git_dir
   endif
-  if a:0 > 1 && a:2 is# 0 && !exists('#User#Fugitive')
-    return ''
-  endif
   if !exists('b:git_dir')
     let b:git_dir = FugitiveExtractGitDir(a:0 ? a:1 : bufnr(''))
   endif
-  if empty(b:git_dir) || !exists('#User#Fugitive')
-    return ''
-  endif
-  if v:version >= 704 || (v:version == 703 && has('patch442'))
-    doautocmd <nomodeline> User Fugitive
-  elseif &modelines > 0
-    let modelines = &modelines
-    try
-      set modelines=0
-      doautocmd User Fugitive
-    finally
-      let &modelines = modelines
-    endtry
-  else
-    doautocmd User Fugitive
-  endif
   return ''
 endfunction
 
@@ -500,8 +488,6 @@ endfunction
 
 if exists('+shellslash')
 
-  let s:dir_commit_file = '\c^fugitive://\%(/\a\@=\)\=\(.\{-\}\)//\%(\(\x\{40,\}\|[0-3]\)\(/.*\)\=\)\=$'
-
   function! s:Slash(path) abort
     return tr(a:path, '\', '/')
   endfunction
@@ -516,8 +502,6 @@ if exists('+shellslash')
 
 else
 
-  let s:dir_commit_file = '\c^fugitive://\(.\{-\}\)//\%(\(\x\{40,\}\|[0-3]\)\(/.*\)\=\)\=$'
-
   function! s:Slash(path) abort
     return a:path
   endfunction
@@ -541,7 +525,7 @@ endif
 function! s:ProjectionistDetect() abort
   let file = s:Slash(get(g:, 'projectionist_file', ''))
   let dir = FugitiveExtractGitDir(file)
-  let base = get(matchlist(file, s:dir_commit_file), 1, '')
+  let base = matchstr(file, '^fugitive://.\{-\}//\x\+')
   if empty(base)
     let base = s:Tree(dir)
   endif
@@ -568,9 +552,6 @@ command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete Git exe
 if exists(':Gstatus') != 2 && get(g:, 'fugitive_legacy_commands', 0)
   exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Gstatus is deprecated in favor of :Git (with no arguments)"|echohl NONE'
-elseif exists(':Gstatus') != 2 && !exists('g:fugitive_legacy_commands')
-  exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus'
-        \ ' echoerr ":Gstatus has been removed in favor of :Git (with no arguments)"'
 endif
 
 for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
@@ -578,9 +559,6 @@ for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'B
     exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
           \ 'echohl WarningMSG|echomsg ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '"|echohl NONE|'
           \ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
-  elseif exists(':G' . tolower(s:cmd)) != 2 && !exists('g:fugitive_legacy_commands')
-    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
-          \ 'echoerr ":G' . tolower(s:cmd) . ' has been removed in favor of :Git ' . tolower(s:cmd) . '"'
   endif
 endfor
 unlet s:cmd
@@ -591,13 +569,6 @@ exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd
 exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep  exe fugitive#GrepCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#GrepCommand(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", <q-args>)'
 
-if exists(':Glog') != 2 && get(g:, 'fugitive_legacy_commands', 0)
-  exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
-        \ '|echohl WarningMSG|echomsg ":Glog is deprecated in favor of :Gclog"|echohl NONE'
-elseif exists(':Glog') != 2 && !exists('g:fugitive_legacy_commands')
-  exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog'
-        \ ' echoerr ":Glog has been removed in favor of :Gclog"'
-endif
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gclog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GcLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
 exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gllog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
@@ -605,10 +576,11 @@ exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete
 
 exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
 exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
-exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gsplit   exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
-exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gvsplit  exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
-exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs  '-complete=customlist,fugitive#ReadComplete   Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#EditComplete   Gsplit   exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#EditComplete   Gvsplit  exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs  '-complete=customlist,fugitive#EditComplete   Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gdrop    exe fugitive#DropCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
 
 if exists(':Gr') != 2
   exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gr     exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
@@ -638,7 +610,7 @@ if exists(':Gdelete') != 2 && get(g:, 'fugitive_legacy_commands', 0)
   exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
         \ '|echohl WarningMSG|echomsg ":Gdelete is deprecated in favor of :GDelete"|echohl NONE'
 elseif exists(':Gdelete') != 2 && !exists('g:fugitive_legacy_commands')
-  exe 'command! -bar -bang -nargs=0 Gdelete echoerr ":Gremove has been removed in favor of :GRemove"'
+  exe 'command! -bar -bang -nargs=0 Gdelete echoerr ":Gdelete has been removed in favor of :GDelete"'
 endif
 if exists(':Gmove') != 2 && get(g:, 'fugitive_legacy_commands', 0)
   exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
@@ -664,7 +636,7 @@ elseif exists(':Gbrowse') != 2 && !exists('g:fugitive_legacy_commands')
         \ 'echoerr ":Gbrowse has been removed in favor of :GBrowse"'
 endif
 
-if v:version < 703
+if v:version < 704
   finish
 endif
 
@@ -688,8 +660,14 @@ let g:io_fugitive = {
 augroup fugitive
   autocmd!
 
-  autocmd BufNewFile,BufReadPost *  call FugitiveDetect(+expand('<abuf>'), 0)
-  autocmd FileType           netrw  call FugitiveDetect(+expand('<abuf>'), 0)
+  autocmd BufNewFile,BufReadPost *
+        \ if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir |
+        \   unlet b:git_dir |
+        \ endif
+  autocmd FileType           netrw
+        \ if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir |
+        \   unlet b:git_dir |
+        \ endif
   autocmd BufFilePost            *  unlet! b:git_dir
 
   autocmd FileType git
@@ -714,6 +692,9 @@ augroup fugitive
         \ if FugitiveIsGitDir(expand('<amatch>:p:h')) |
         \   let b:git_dir = s:Slash(expand('<amatch>:p:h')) |
         \   exe fugitive#BufReadStatus(v:cmdbang) |
+        \   echohl WarningMSG |
+        \   echo "fugitive: Direct editing of .git/" . expand('%:t') . " is deprecated" |
+        \   echohl NONE |
         \ elseif filereadable(expand('<amatch>')) |
         \   silent doautocmd BufReadPre |
         \   keepalt noautocmd read <amatch> |
@@ -723,15 +704,15 @@ augroup fugitive
         \   silent doautocmd BufNewFile |
         \ endif
 
-  autocmd BufReadCmd   fugitive://*//*       nested exe fugitive#BufReadCmd() |
+  autocmd BufReadCmd   fugitive://*          nested exe fugitive#BufReadCmd() |
         \ if &path =~# '^\.\%(,\|$\)' |
         \   let &l:path = substitute(&path, '^\.,\=', '', '') |
         \ endif
-  autocmd BufWriteCmd  fugitive://*//[0-3]/* nested exe fugitive#BufWriteCmd()
-  autocmd FileReadCmd  fugitive://*//*       nested exe fugitive#FileReadCmd()
-  autocmd FileWriteCmd fugitive://*//[0-3]/* nested exe fugitive#FileWriteCmd()
+  autocmd BufWriteCmd  fugitive://*          nested exe fugitive#BufWriteCmd()
+  autocmd FileReadCmd  fugitive://*          nested exe fugitive#FileReadCmd()
+  autocmd FileWriteCmd fugitive://*          nested exe fugitive#FileWriteCmd()
   if exists('##SourceCmd')
-    autocmd SourceCmd     fugitive://*//*    nested exe fugitive#SourceCmd()
+    autocmd SourceCmd     fugitive://*       nested exe fugitive#SourceCmd()
   endif
 
   autocmd User Flags call Hoist('buffer', function('FugitiveStatusline'))
@@ -739,14 +720,15 @@ augroup fugitive
   autocmd User ProjectionistDetect call s:ProjectionistDetect()
 augroup END
 
+nmap <script><silent> <Plug>fugitive:y<C-G> :<C-U>call setreg(v:register, fugitive#Object(@%))<CR>
+nmap <script> <Plug>fugitive: <Nop>
+
 if get(g:, 'fugitive_no_maps')
   finish
 endif
 
-let s:nowait = v:version >= 704 ? '<nowait>' : ''
-
 function! s:Map(mode, lhs, rhs, flags) abort
-  let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>')
+  let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>') . '<nowait>'
   let head = a:lhs
   let tail = ''
   let keys = get(g:, a:mode.'remap', {})
@@ -764,11 +746,9 @@ function! s:Map(mode, lhs, rhs, flags) abort
     endwhile
   endif
   if empty(mapcheck(head.tail, a:mode))
-    exe a:mode.'map' s:nowait flags head.tail a:rhs
+    exe a:mode.'map' flags head.tail a:rhs
   endif
 endfunction
 
 call s:Map('c', '<C-R><C-G>', 'fnameescape(fugitive#Object(@%))', '<expr>')
 call s:Map('n', 'y<C-G>', ':<C-U>call setreg(v:register, fugitive#Object(@%))<CR>', '<silent>')
-nmap <script><silent> <Plug>fugitive:y<C-G> :<C-U>call setreg(v:register, fugitive#Object(@%))<CR>
-nmap <script> <Plug>fugitive: <Nop>

syntax/fugitive.vim

@@ -13,7 +13,7 @@ syn match fugitiveHeader /^Pull:\|^Rebase:\|^Merge:\|^Push:/ nextgroup=fugitiveS
 syn match fugitiveHelpHeader /^Help:/ nextgroup=fugitiveHelpTag skipwhite
 syn match fugitiveHelpTag    /\S\+/ contained
 
-syn region fugitiveSection start=/^\%(.*(\d\++\=)$\)\@=/ contains=fugitiveHeading end=/^$/
+syn region fugitiveSection start=/^\%(.*(\d\++\=)$\)\@=/ contains=fugitiveHeading end=/^$/ fold
 syn cluster fugitiveSection contains=fugitiveSection
 syn match fugitiveHeading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite
 syn match fugitiveCount /(\d\++\=)/hs=s+1,he=e-1 contained
@@ -30,7 +30,7 @@ syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
 syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=diffLine,diffRemoved,diffAdded,diffNoEOL containedin=@fugitiveSection fold
 
 for s:section in ['Untracked', 'Unstaged', 'Staged']
-  exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\++\=)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/'
+  exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\++\=)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/ fold'
   exe 'syn match fugitive' . s:section . 'Modifier /^[MADRCU?] / contained containedin=fugitive' . s:section . 'Section'
   exe 'syn cluster fugitiveSection add=fugitive' . s:section . 'Section'
   exe 'syn match fugitive' . s:section . 'Heading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite'