Provide :Git difftool and :Git mergetool

References https://github.com/tpope/vim-fugitive/issues/132

README.markdown

@@ -1,66 +1,51 @@
 # fugitive.vim
 
-Fugitive is the premier Vim plugin for Git.  Or maybe it's the premier Git
-plugin for Vim?  Either way, it's "so awesome, it should be illegal".  That's
-why it's called Fugitive.
+I'm not going to lie to you; fugitive.vim may very well be the best
+Git wrapper of all time.  Check out these features:
 
-The crown jewel of Fugitive is `:Git` (or just `:G`), which calls any
-arbitrary Git command.  If you know how to use Git at the command line, you
-know how to use `:Git`.  It's vaguely akin to `:!git` but with numerous
-improvements:
+Bring up an enhanced version of `git status` with `:G` (also known as
+`:Gstatus`).  Press `g?` to bring up a list of maps for numerous operations
+including diffing, staging, committing, rebasing, and stashing.
 
-* The default behavior is to directly echo the command's output.  Quiet
-  commands like `:Git add` avoid the dreaded "Press ENTER or type command to
-  continue" prompt.
-* `:Git commit`, `:Git rebase -i`, and other commands that invoke an editor do
-  their editing in the current Vim instance.
-* `:Git diff`, `:Git log`, and other verbose, paginated commands have their
-  output loaded into a temporary buffer.  Force this behavior for any command
-  with `:Git --paginate` or `:Git -p`.
-* `:Git blame` uses a temporary buffer with maps for additional triage.  Press
-  enter on a line to view the commit where the line changed, or `g?` to see
-  other available maps.  Omit the filename argument and the currently edited
-  file will be blamed in a vertical, scroll-bound split.
-* `:Git mergetool` and `:Git difftool` load their changesets into the quickfix
-  list.
-* Called with no arguments, `:Git` opens a summary window with dirty files and
-  unpushed and unpulled commits.  Press `g?` to bring up a list of maps for
-  numerous operations including diffing, staging, committing, rebasing, and
-  stashing.  (This is the successor to the old `:Gstatus`.)
-* This command (along with all other commands) always uses the current
-  buffer's repository, so you don't need to worry about the current working
-  directory.
+View any blob, tree, commit, or tag in the repository with `:Gedit` (and
+`:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...).  Edit a file in the index and
+write to it to stage the changes.  Use `:Gdiffsplit` to bring up the staged
+version of the file side by side with the working tree version and use
+Vim's diff handling capabilities to stage a subset of the file's
+changes.
 
-Additional commands are provided for higher level operations:
+Commit, merge, and rebase with `:Gcommit`, `:Gmerge`, and `:Grebase`, using
+the current Vim instance to edit commit messages and the rebase todo list.
+Use `:Gpush`, `:Gfetch`, and `:Gpull` to send and retrieve upstream changes.
 
-* View any blob, tree, commit, or tag in the repository with `:Gedit` (and
-  `:Gsplit`, etc.).  For example, `:Gedit HEAD~3:%` loads the current file as
-  it existed 3 commits ago.
-* `:Gdiffsplit` (or `:Gvdiffsplit`) brings up the staged version of the file
-  side by side with the working tree version.  Use Vim's diff handling
-  capabilities to apply changes to the staged version, and write that buffer
-  to stage the changes.  You can also give an arbitrary `:Gedit` argument to
-  diff against older versions of the file.
-* `:Gread` is a variant of `git checkout -- filename` that operates on the
-  buffer rather than the file itself.  This means you can use `u` to undo it
-  and you never get any warnings about the file changing outside Vim.
-* `:Gwrite` writes to both the work tree and index versions of a file, making
-  it like `git add` when called from a work tree file and like `git checkout`
-  when called from the index or a blob in history.
-* `:Ggrep` is `:grep` for `git grep`.  `:Glgrep` is `:lgrep` for the same.
-* `:GMove` does a `git mv` on the current file and changes the buffer name to
-  match.  `:GRename` does the same with a destination filename relative to the
-  current file's directory.
-* `:GDelete` does a `git rm` on the current file and simultaneously deletes
-  the buffer.  `:GRemove` does the same but leaves the (now empty) buffer
-  open.
-* `:GBrowse` to open the current file on the web front-end of your favorite
-  hosting provider, with optional line range (try it in visual mode).  Plugins
-  are available for popular providers such as [GitHub][rhubarb.vim],
-  [GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
-  [Gitee][fugitive-gitee.vim], [Pagure][pagure],
-  [Phabricator][vim-phabricator], [Azure DevOps][fugitive-azure-devops.vim],
-  and [sourcehut][srht.vim].
+`:Gblame` brings up an interactive vertical split with `git blame`
+output.  Press enter on a line to edit the commit where the line
+changed, or `o` to open it in a split.  When you're done, use `:Gedit`
+in the historic buffer to go back to the work tree version.
+
+`:Gmove` does a `git mv` on a file and simultaneously renames the
+buffer.  `:Gdelete` does a `git rm` on a file and simultaneously deletes
+the buffer.
+
+Use `:Ggrep` to search the work tree (or any arbitrary commit) with
+`git grep`, skipping over that which is not tracked in the repository.
+`:Gclog` and `:Gllog` load all previous commits into the quickfix or location
+list.  Give them a range (e.g., using visual mode and `:'<,'>Gclog`) to
+iterate over every change to that portion of the current file.
+
+`:Gread` is a variant of `git checkout -- filename` that operates on the
+buffer rather than the filename.  This means you can use `u` to undo it
+and you never get any warnings about the file changing outside Vim.
+`:Gwrite` writes to both the work tree and index versions of a file,
+making it like `git add` when called from a work tree file and like
+`git checkout` when called from the index or a blob in history.
+
+Use `:Gbrowse` to open the current file on the web front-end of your favorite
+hosting provider, with optional line range (try it in visual mode).  Plugins
+are available for popular providers such as [GitHub][rhubarb.vim],
+[GitLab][fugitive-gitlab.vim], [Bitbucket][fubitive.vim],
+[Gitee][fugitive-gitee.vim], [Pagure][pagure], and
+[Phabricator][vim-phabricator].
 
 [rhubarb.vim]: https://github.com/tpope/vim-rhubarb
 [fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
@@ -68,12 +53,12 @@ Additional commands are provided for higher level operations:
 [fugitive-gitee.vim]: https://github.com/linuxsuren/fugitive-gitee.vim
 [pagure]: https://github.com/FrostyX/vim-fugitive-pagure
 [vim-phabricator]: https://github.com/jparise/vim-phabricator
-[fugitive-azure-devops.vim]: https://github.com/cedarbaum/fugitive-azure-devops.vim
-[srht.vim]: https://git.sr.ht/~willdurand/srht.vim
 
 Add `%{FugitiveStatusline()}` to `'statusline'` to get an indicator
 with the current branch in your statusline.
 
+Last but not least, there's `:Git` for running any arbitrary command.
+
 For more information, see `:help fugitive`.
 
 ## Screencasts
@@ -95,20 +80,20 @@ Install using your favorite package manager, or use Vim's built-in package suppo
 
 ## FAQ
 
-> What happened to the dispatch.vim backed asynchronous `:Gpush` and
-> `:Gfetch`?
+> Why can't I enter my password when I `:Gpush`?
 
-This behavior was divisive, confusing, and complicated inputting passwords, so
-it was removed.  Use `:Git! push` to use Fugitive's own asynchronous
-execution, or retroactively make `:Git push` asynchronous by pressing
-`CTRL-D`.
+It is highly recommended to use SSH keys or [credentials caching][] to avoid
+entering your password on every upstream interaction.  If this isn't an
+option, the official solution is to use the `core.askPass` Git option to
+request the password via a GUI.  Fugitive will configure this for you
+automatically if you have `ssh-askpass` or `git-gui` installed; otherwise it's
+your responsibility to set this up.
 
-> So I have a symlink and...
+As an absolute last resort, you can invoke `:Git --paginate push`.  Fugitive
+recognizes the pagination request and fires up a `:terminal`, which allows for
+interactive password entry.
 
-Stop.  Just stop.  If Git won't deal with your symlink, then Fugitive won't
-either.  Consider using a [plugin that resolves
-symlinks](https://github.com/aymericbeaumet/symlink.vim), or even better,
-using fewer symlinks.
+[credentials caching]: https://help.github.com/en/articles/caching-your-github-password-in-git
 
 ## Self-Promotion
 

doc/fugitive.txt

@@ -15,46 +15,63 @@ COMMANDS                                        *fugitive-commands*
 These commands are local to the buffers in which they work (generally, buffers
 that are part of Git repositories).
 
-                                                *fugitive-:G*
-:G [args]               Same as :Git, but two characters shorter.
-
-                                                *:Git*
-:Git {args}             Run an arbitrary git command and display any output.
-                        On UNIX this uses a pty and on other platforms it uses
-                        a pipe, which will cause some behavior differences
-                        such as the absence of progress bars.  Any file the
-                        command edits (for example, a commit message) will be
-                        loaded into a split window.  Closing that window will
-                        resume running the command.  A few Git subcommands
-                        have different behavior; these are documented below.
+                                                *:Git* *fugitive-:G*
+:Git {args}             Run an arbitrary git command. Similar to :!git [args]
+:G {args}               but chdir to the repository tree first.  For some
+                        subcommands, a Fugitive command is called instead.
 
                                                 *:Git!*
-:Git! {args}            Run an arbitrary git command in the background and
-                        stream the output to the preview window.  Requires a
-                        Vim with |setbufline()|.  Press CTRL-D during an
-                        interactive :Git invocation to switch to this mode
-                        retroactively.
+:Git! {args}            Like |:Git|, but capture the output into a temp file,
+:Git --no-pager {args}  and |:split| that temp file.  Use :0Git to
+:Git -P {args}          |:edit| the temp file instead.  A temp file is always
+                        used for diff and log commands.
 
-                                                *:Git_--paginate* *:Git_-p*
-:Git --paginate {args}  Run an arbitrary git command, capture output to a temp
-:Git -p {args}          file, and |:split| that temp file.  Pass ++curwin as
-                        the first argument to |:edit| the temp file instead.
-                        A temp file is always used for commands like diff and
-                        log that typically uses a pager, and for any command
-                        that has the pager.<cmd> Git configuration option set.
+                                                *:Gstatus*
+:Git                    Bring up a summary window vaguely akin to git-status.
+:G                      Press g? or see |fugitive-maps| for usage.
+:Gstatus
 
-:{range}Git! --paginate {args}
-:{range}Git! -p {args}  Run an arbitrary git command, and insert the output
-                        after {range} in the current buffer.
+                                                *:Git-commit* *:Gcommit*
+:Git commit [args]      A wrapper around git-commit.  Unless the arguments
+:Gcommit [args]         given would skip the invocation of an editor (e.g.,
+                        -m), a split window will be used to obtain a commit
+                        message, or a new tab if -v is given.  Write and close
+                        the window (:wq) to finish the commit. To cancel, use
+                        an empty message.
 
-                                                *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-revert* *:Grevert*
+:Git revert [args]      A wrapper around git-revert.  Similar to |:Gcommit|.
+:Grevert [args]
 
-                                                *:Git_blame*
+                                                *:Git-merge* *:Gmerge*
+:Git merge [args]       Calls git-merge and loads errors and conflicted files
+:Gmerge [args]          into the |quickfix| list.  Opens a |:Gcommit| style
+                        split window for the commit message if the merge
+                        succeeds.  If called during a merge conflict, the
+                        conflicted files from the current index are loaded
+                        into the |quickfix| list.
+
+                                                *:Git-pull* *:Gpull*
+:Git pull [args]        Like |:Gmerge|, but for git-pull.
+:Gpull [args]
+
+                                                *:Git-rebase* *:Grebase*
+:Git rebase [args]      Like |:Gmerge|, but for git-rebase.  Interactive
+:Grebase [args]         rebase is experimentally supported.
+
+                                                *:Git-push* *:Gpush*
+:Git push [args]        Invoke git-push, load the results into the |quickfix|
+:Gpush [args]           list, and invoke |:cwindow| to reveal any errors.
+                        |:Dispatch| is used if available for asynchronous
+                        invocation.
+
+                                                *:Git-fetch* *:Gfetch*
+:Git fetch [args]       Like |:Gpush|, but for git-fetch.
+:Gfetch [args]
+
+                                                *:Git-blame* *:Gblame*
 :Git blame [flags]      Run git-blame [flags] on the current file and open the
-                        results in a scroll-bound vertical split.  The
+:Gblame [flags]         results in a scroll-bound vertical split.  The
                         following maps, which work on the cursor line commit
                         where sensible, are provided:
 
@@ -73,18 +90,20 @@ that are part of Git repositories).
                         ~     reblame at [count]th first grandparent
                         P     reblame at [count]th parent (like HEAD^[count])
 
-                                                *g:fugitive_dynamic_colors*
-                        In the GUI or a 256 color terminal, commit hashes will
-                        highlighted in different colors. To disable this:
->
-                        let g:fugitive_dynamic_colors = 0
-<
-:[range]Git blame [...] If a range is given, just that part of the file will
-:Git blame [...] {file} be blamed, and a horizontal split without
-                        scrollbinding is used.  You can also give an arbitrary
+:[range]Gblame [flags]  If a range is given, just that part of the file will
+:Gblame [flags] {file}  be blamed, and a horizontal split without
+:Git blame ...          scrollbinding is used.  You can also give an arbitrary
                         filename.
 
-                                                *:Git_difftool*
+                                                *:Ggrep* *:Gcgrep* *:Git-grep*
+:Ggrep[!] [args]        |:grep|[!] with git-grep as 'grepprg'.
+:Git[!] grep [args]
+
+                                                *:Glgrep*
+:Glgrep[!] [args]       |:lgrep|[!] with git-grep as 'grepprg'.
+:0Git[!] grep [args]
+
+                                                *:Git-difftool*
 :Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the
                         quickfix list.  Each changed hunk gets a separate
                         quickfix entry unless you pass an option like
@@ -92,33 +111,17 @@ that are part of Git repositories).
                         change unless [!] is given.
 
 :Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
-                        new tab, and invoke |:Gdiffsplit!| against the
+                        new tab, and invoke `:Gdiffsplit` against the
                         appropriate commit.
 
-                                                *:Git_mergetool*
-:Git mergetool [args]   Like |:Git_difftool|, but target merge conflicts.
+                                                *:Git-mergetool*
+:Git mergetool [args]   Like |:Git-difftool|, but target merge conflicts.
 
-                                                *:Ggrep* *:Git_grep*
-:Ggrep[!] [args]        An approximation of |:grep|[!] with git-grep as
-:Git[!] grep -O [args]  'grepprg'.
-
-:Ggrep[!] --quiet [args]
-:Ggrep[!] -q [args]     Like |:Ggrep|, but instead of displaying output, open
-                        the quickfix list.
-
-                                                *:Glgrep*
-:Glgrep[!] [args]       :Ggrep but for |:lgrep|.
-:0Git[!] grep -O [args]
-
-                                                 *:Gclog*
+                                                 *:Gclog* *:Glog*
 :Gclog[!] [args]        Use git-log [args] to load the commit history into the
-                        |quickfix| list.  Jumps to the first commit unless [!]
+:Glog[!] [args]         |quickfix| list.  Jumps to the first commit unless [!]
                         is given.
 
-                        The quickfix list can be awkward for many use cases
-                        and exhibits extremely poor performance with larger
-                        data sets.  Consider using |:Git| log instead.
-
 :{range}Gclog[!] [args] Use git-log -L to load previous revisions of the given
                         range of the current file into the |quickfix| list.
                         The cursor is positioned on the first line of the
@@ -150,6 +153,13 @@ that are part of Git repositories).
                                                 *:Gpedit*
 :Gpedit [object]        |:pedit| a |fugitive-object|.
 
+:Gsplit! [args]                                 *:Gsplit!* *:Gvsplit!*
+:Gvsplit! [args]                                *:Gtabedit!* *:Gpedit!*
+:Gtabedit! [args]       Capture the output of `git [args]` to a temp file and
+:Gpedit! [args]         open it in a split, tab, or preview window.  Use
+                        :0Gsplit! to suppress the split and open it in the
+                        current window.
+
                                                 *:Gread* *fugitive-:Gr*
 :Gread [object]         Empty the buffer and |:read| a |fugitive-object|.
                         When the argument is omitted, this is similar to
@@ -188,17 +198,17 @@ that are part of Git repositories).
 :Gdiffsplit [object]    Perform a |vimdiff| against the given file, or if a
                         commit is given, the current file in that commit.
                         With no argument, the version in the index or work
-                        tree is used, and the work tree version is always
-                        placed to the right or bottom, depending on available
-                        width.  Use Vim's |do| and |dp| to stage and unstage
-                        changes.
+                        tree is used.  The newer of the two files is placed to
+                        the right or bottom, depending on 'diffopt' and the
+                        width of the window relative to 'textwidth'.  Use
+                        Vim's |do| and |dp| to stage and unstage changes.
 
                                                 *:Gdiffsplit!*
 :Gdiffsplit!            Diff against any and all direct ancestors, retaining
                         focus on the current window.  During a merge conflict,
                         this is a three-way diff against the "ours" and
                         "theirs" ancestors.  Additional d2o and d3o maps are
-                        provided to obtain the hunk from the "ours" or
+                        provided to to obtain the hunk from the "ours" or
                         "theirs" ancestor, respectively.
 
 :Gdiffsplit! {object}   Like |:Gdiffsplit|, but retain focus on the current
@@ -207,60 +217,58 @@ that are part of Git repositories).
                                                 *:Gvdiffsplit*
 :Gvdiffsplit [object]   Like |:Gdiffsplit|, but always split vertically.
 
-                                                *:Ghdiffsplit*
-:Gdiffsplit ++novertical [object]
-:Ghdiffsplit [object]   Like |:Gdiffsplit|, but with "vertical" removed from
-                        'diffopt'.  The split will still be vertical if
-                        combined with |:vertical|.
+                                *:Ghdiffsplit* *:Gsdiff*
+:Ghdiffsplit [object]   Like |:Gdiffsplit|, but always split horizontally.
 
-                                                *:GMove*
-:GMove {destination}    Wrapper around git-mv that renames the buffer
+                                                *:Gmove*
+:Gmove {destination}    Wrapper around git-mv that renames the buffer
                         afterward.  Add a ! to pass -f.
 
-                                                *:GRename*
-:GRename {destination}  Like |:GMove| but operates relative to the parent
+                                                *:Grename*
+:Grename {destination}  Like |:Gmove| but operates relative to the parent
                         directory of the current file.
 
-                                                *:GDelete*
-:GDelete                Wrapper around git-rm that deletes the buffer
+                                                *:Gdelete*
+:Gdelete                Wrapper around git-rm that deletes the buffer
                         afterward.  When invoked in an index file, --cached is
                         passed.  Add a ! to pass -f and forcefully discard the
                         buffer.
 
-                                                *:GRemove*
-:GRemove                Like |:GDelete|, but keep the (now empty) buffer around.
+                                                *:Gremove*
+:Gremove                Like :Gdelete, but keep the (now empty) buffer around.
 
-                                                *:GBrowse*
-:GBrowse                Open the current file, blob, tree, commit, or tag
+                                                *:Gbrowse*
+:Gbrowse                Open the current file, blob, tree, commit, or tag
                         in your browser at the upstream hosting provider.
+                        If a range is given, it is appropriately appended to
+                        the URL as an anchor.
+
                         Upstream providers can be added by installing an
                         appropriate Vim plugin.  For example, GitHub can be
                         supported by installing rhubarb.vim, available at
                         <https://github.com/tpope/vim-rhubarb>.
 
-:GBrowse {object}       Like :GBrowse, but for a given |fugitive-object|.
+:Gbrowse {object}       Like :Gbrowse, but for a given |fugitive-object|.
 
-:{range}GBrowse [args]  Appends an anchor to the URL that emphasizes the
+:Gbrowse [...]@{remote} Force using the given remote rather than the remote
+                        for the current branch.  The remote is used to
+                        determine which upstream repository to link to.
+
+:{range}Gbrowse [args]  Appends an anchor to the URL that emphasizes the
                         selected lines. This also forces the URL to include a
                         commit rather than a branch name so it remains valid
                         if the file changes.  You can give a range of "0" to
                         force this behavior without including an anchor.
 
-:GBrowse [...]@{remote} Force using the given remote rather than the remote
-                        for the current branch.  The remote is used to
-                        determine which upstream repository to link to.
-
-:GBrowse {url}          Open an arbitrary URL in your browser.
-
-:[range]GBrowse! [args] Like :GBrowse, but put the URL on the clipboard rather
+:[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
                         than opening it.
 
 MAPS                                            *fugitive-maps*
 
-These maps are available in both the |fugitive-summary| buffer and Fugitive
-object buffers, although not all maps make sense in all buffers.  Mappings
-that operate on the file or hunk under the cursor are generally available in
-visual mode to operate on multiple files or partial hunks.
+These maps are available in both the |:Gstatus| buffer and Fugitive object
+buffers, although not all maps make sense in all buffers.  Mappings that
+operate on the file or hunk under the cursor are generally available in visual
+mode to operate on multiple files or partial hunks.
 
                                                 *fugitive-staging-maps*
 Staging/unstaging maps ~
@@ -281,9 +289,10 @@ U                       Unstage everything.
 X                       Discard the change under the cursor.  This uses
                         `checkout` or `clean` under the hood.  A command is
                         echoed that shows how to undo the change.  Consult
-                        `:messages` to see it again.  During a merge conflict,
-                        use 2X to call `checkout --ours` or 3X to call
-                        `checkout --theirs` .
+                        `:messages` to see it again.  You can use this during
+                        a merge conflict do discard "our" changes (--theirs)
+                        in the "Unstaged" section or discard "their" changes
+                        (--ours) in the "Staged" section.
 
                                                 *fugitive_=*
 =                       Toggle an inline diff of the file under the cursor.
@@ -306,7 +315,7 @@ P                       under the cursor. On untracked files, this instead
                                                 *fugitive_d*
 Diff maps ~
                                                 *fugitive_dp*
-dp                      Invoke |:Git| diff on the file under the cursor.
+dp                      Invoke |:Git!| diff on the file under the cursor.
                         Deprecated in favor of inline diffs.
 
                                                 *fugitive_dd*
@@ -330,7 +339,7 @@ Navigation maps ~
 
                                                 *fugitive_<CR>*
 <CR>                    Open the file or |fugitive-object| under the cursor.
-                        In a blob, this and similar maps jump to the patch
+                        in a blob, this and similar maps jump to the patch
                         from the diff where this was added, or where it was
                         removed if a count was given.  If the line is still in
                         the work tree version, passing a count takes you to
@@ -405,7 +414,7 @@ i                       Jump to the next file or hunk, expanding inline diffs
 ][                      Jump [count] section ends forward.
 
                                                 *fugitive_star*
-*                       On the first column of a + or - diff line, search for
+*                       One the first column of a + or - diff line, search for
                         the corresponding - or + line.  Otherwise, defer to
                         built-in |star|.
 
@@ -500,7 +509,7 @@ 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
-                        `--keep-index`.
+                        `--include-index`.
 
 czA                     Apply topmost stash, or stash@{count}.
 
@@ -609,9 +618,7 @@ Makefile        The file named Makefile in the work tree
 !:Makefile      The file named Makefile in the commit owning the current file
 !3^2            The second parent of the commit owning buffer #3
 .git/config     The repo config file
-:               The |fugitive-summary| buffer
--               A temp file containing the last |:Git| invocation's output
-<cfile>         The file or commit under the cursor
+:               Same as |:Gstatus|
 
 STATUSLINE                                      *fugitive-statusline*
 
@@ -622,87 +629,11 @@ a statusline, this one matches the default when 'ruler' is set:
 >
         set statusline=%<%f\ %h%m%r%{FugitiveStatusline()}%=%-14.(%l,%c%V%)\ %P
 <
-AUTOCOMMANDS                                    *fugitive-autocommands*
-
-A handful of |User| |autocommands| are provided to allow extending and
-overriding Fugitive behaviors.  Example usage:
->
-        autocmd User FugitiveBlob,FugitiveStageBlob call s:BlobOverrides()
-<
-                                                *User_FugitiveTag*
-FugitiveTag             After loading a tag object.
-
-                                                *User_FugitiveCommit*
-FugitiveCommit          After loading a commit object.
-
-                                                *User_FugitiveTree*
-FugitiveTree            After loading a tree (directory) object.
-
-                                                *User_FugitiveBlob*
-FugitiveBlob            After loading a committed blob (file) object.
-
-                                                *User_FugitiveObject*
-FugitiveObject          After loading any of the 4 above buffer types.
-
-                                                *User_FugitiveStageBlob*
-FugitiveStageBlob       After loading a staged blob (file) object.  These
-                        buffers are 'modifiable' and oftentimes don't want the
-                        same behavior as the other buffer types.
-
-                                                *User_FugitiveIndex*
-FugitiveIndex           After loading the |fugitive-summary| buffer.
-
-                                                *User_FugitivePager*
-FugitivePager           After loading a temp file created by a command like
-                        :Git --paginate or :Git blame.
-
-                                                *User_FugitiveChanged*
-FugitiveChanged         After any event which can potentially change the
-                        repository, for example, any invocation of |:Git|.
-                        Originally intended for expiring caches, but can have
-                        other uses.
-
-API                                             *fugitive-api*
-
-Officially supported functions are documented inline in plugin/fugitive.vim.
-
-DEPRECATIONS                                    *fugitive-deprecated*
-
-The following commands are deprecated in favor of replacements that adhere to
-a new naming scheme.  Remember that |:Git| can be shortened to |:G|, so
-replacements using it are just one space character longer than the legacy
-version.
-
-*:Gremove*      Superseded by |:GRemove|.
-*:Gdelete*      Superseded by |:GDelete|.
-*:Gmove*        Superseded by |:GMove|.
-*:Grename*      Superseded by |:GRename|.
-*:Gbrowse*      Superseded by |:GBrowse|.
-*:Gdiff*        Superseded by |:Gdiffsplit|
-*:Gsdiff*       Superseded by |:Ghdiffsplit|
-*:Gvdiff*       Superseded by |:Gvdiffsplit| or |:vert| |:Gdiffsplit|.
-*:Gblame*       Superseded by |:Git_blame|.
-*:Gcommit*      Superseded by |:Git| commit.
-*:Gmerge*       Superseded by |:Git| merge and |:Git_mergetool|.
-*:Gpull*        Superseded by |:Git| pull.
-*:Grebase*      Superseded by |:Git| rebase.
-*:Grevert*      Superseded by |:Git| revert.
-*:Gpush*        Superseded by |:Git| push.
-*:Gfetch*       Superseded by |:Git| fetch.
-*:Glog*         Superseded by |:Gclog|.
-*:Gstatus*      Superseded by |:Git| (with no arguments).
-*:Gsplit!*      Superseded by |:Git_--paginate|.
-*:Gvsplit!*     Superseded by :vert Git --paginate.
-*:Gtabsplit!*   Superseded by :tab Git --paginate.
-*:Gpedit!*      Superseded by :Git! --paginate.
-
-                                                *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
-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
-selective events.
+                                *FugitiveHead(...)* *fugitive#head(...)*
+Use FugitiveHead() to return the name of the current branch. If the current
+HEAD is detached, FugitiveHead() will return the empty string, unless the
+optional argument is given, in which case the hash of the current commit will
+be truncated to the given number of characters.
 
 ABOUT                                           *fugitive-about*
 

ftplugin/fugitiveblame.vim

@@ -1,6 +0,0 @@
-if exists("b:did_ftplugin") || !exists("*FugitiveGitDir")
-  finish
-endif
-let b:did_ftplugin = 1
-
-call fugitive#BlameFileType()

plugin/fugitive.vim

@@ -1,6 +1,6 @@
 " fugitive.vim - A Git wrapper so awesome, it should be illegal
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      3.4
+" Version:      3.1
 " GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
 
 if exists('g:loaded_fugitive')
@@ -8,38 +8,20 @@ if exists('g:loaded_fugitive')
 endif
 let g:loaded_fugitive = 1
 
-let s:bad_git_dir = '/$\|^fugitive:'
-
-" FugitiveGitDir() returns the detected Git dir for the given buffer number,
-" or the current buffer if no argument is passed.  This will be an empty
-" string if no Git dir was found.  Use !empty(FugitiveGitDir()) to check if
-" 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
-    return ''
-  elseif !a:0 || type(a:1) == type(0) && a:1 < 0 || a:1 is# get(v:, 'true', -1)
+  if !a:0 || type(a:1) == type(0) && a:1 < 0
     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('')) || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|prompt\)$')
       return FugitiveExtractGitDir(getcwd())
-    elseif (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && empty(&buftype)
-      let b:git_dir = FugitiveExtractGitDir(expand('%:p'))
-      return b:git_dir
     endif
-    return dir =~# s:bad_git_dir ? '' : dir
-  elseif type(a:1) == type(0) && a:1 isnot# 0
-    if a:1 == bufnr('') && (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && empty(&buftype)
-      let b:git_dir = FugitiveExtractGitDir(expand('%:p'))
-    endif
-    let dir = getbufvar(a:1, 'git_dir')
-    return dir =~# s:bad_git_dir ? '' : dir
+    return dir
+  elseif type(a:1) == type(0)
+    return getbufvar(a:1, 'git_dir')
   elseif type(a:1) == type('')
     return substitute(s:Slash(a:1), '/$', '', '')
-  elseif type(a:1) == type({})
-    return get(a:1, 'git_dir', '')
   else
     return ''
   endif
@@ -55,11 +37,7 @@ endfunction
 " exists, call FooReal("foo://bar").
 function! FugitiveReal(...) abort
   let file = a:0 ? a:1 : @%
-  if type(file) ==# type({})
-    let dir = FugitiveGitDir(file)
-    let tree = s:Tree(dir)
-    return FugitiveVimPath(empty(tree) ? dir : tree)
-  elseif file =~# '^\a\a\+:' || a:0 > 1
+  if file =~# '^\a\a\+:' || a:0 > 1
     return call('fugitive#Real', [file] + a:000[1:-1])
   elseif file =~# '^/\|^\a:\|^$'
     return file
@@ -76,16 +54,20 @@ endfunction
 " An optional second argument provides the Git dir, or the buffer number of a
 " buffer with a Git dir.  The default is the current buffer.
 function! FugitiveFind(...) abort
-  if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type(0))
-    return call('fugitive#Find', a:000[1:-1] + [FugitiveGitDir(a:1)])
+  return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
+endfunction
+
+function! FugitivePath(...) abort
+  if a:0 > 1
+    return fugitive#Path(a:1, a:2, FugitiveGitDir(a:0 > 2 ? a:3 : -1))
   else
-    return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
+    return FugitiveReal(a:0 ? a:1 : @%)
   endif
 endfunction
 
 " FugitiveParse() takes a fugitive:// URL and returns a 2 element list
-" containing an object name ("commit:file") and the Git dir.  It's effectively
-" the inverse of FugitiveFind().
+" containing the Git dir and an object name ("commit:file").  It's effectively
+" then inverse of FugitiveFind().
 function! FugitiveParse(...) abort
   let path = s:Slash(a:0 ? a:1 : @%)
   if path !~# '^fugitive:'
@@ -99,167 +81,42 @@ function! FugitiveParse(...) abort
   throw v:errmsg
 endfunction
 
-" FugitiveGitVersion() queries the version of Git in use.  Pass up to 3
-" arguments to return a Boolean of whether a certain minimum version is
-" available (FugitiveGitVersion(2,3,4) checks for 2.3.4 or higher) or no
-" arguments to get a raw string.
-function! FugitiveGitVersion(...) abort
-  return call('fugitive#GitVersion', a:000)
-endfunction
-
-" FugitiveResult() returns an object encapsulating the result of the most
-" recent :Git command.  Will be empty if no result is available.  During a
-" User FugitiveChanged event, this is guaranteed to correspond to the :Git
-" command that triggered the event, or be empty if :Git was not the trigger.
-" Pass in the name of a temp buffer to get the result object for that command
-" instead.  Contains the following keys:
+" FugitivePrepare() constructs 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.
 "
-" * "args": List of command arguments, starting with the subcommand.  Will be
-"   empty for usages like :Git --help.
-" * "git_dir": Git dir of the relevant repository.
-" * "exit_status": The integer exit code of the process.
-" * "flags": Flags passed directly to Git, like -c and --help.
-" * "file": Path to file containing command output.  Not guaranteed to exist,
-"   so verify with filereadable() before trying to access it.
-function! FugitiveResult(...) abort
-  return call('fugitive#Result', a:000)
-endfunction
-
-" FugitiveExecute() runs Git with a list of arguments and returns a dictionary
-" with the following keys:
-"
-" * "exit_status": The integer exit code of the process.
-" * "stdout": The stdout produced by the process, as a list of lines.
-" * "stderr": The stdout produced by the process, as a list of lines.
-"
-" An optional second argument provides the Git dir, or the buffer number of a
-" buffer with a Git dir.  The default is the current buffer.
-"
-" An optional final argument is a callback Funcref, for asynchronous
-" execution.
-function! FugitiveExecute(args, ...) abort
-  return call('fugitive#Execute', [a:args] + a:000)
-endfunction
-
-" FugitiveShellCommand() turns an array of arugments 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.
-"
-" An optional second argument provides the Git dir, or the buffer number of a
-" buffer with a Git dir.  The default is the current buffer.
-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.
+" If the first argument is a string that looks like a path or an empty string,
+" it will be used as the Git dir.  If it's a buffer number, the Git dir for
+" that buffer will be used.  The default is the current buffer.
 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)
+  return call('fugitive#Prepare', 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
-" structure of the return value as it is not guaranteed.  If you want a full
-" dictionary of every config value, use FugitiveConfigGetRegexp('.*').
-"
-" An optional argument provides the Git dir, or the buffer number of a
-" buffer with a Git dir.  The default is the current buffer.  Pass a blank
-" string to limit to the global config.
 function! FugitiveConfig(...) abort
-  return call('fugitive#Config', a:000)
-endfunction
-
-" FugitiveConfigGet() retrieves a Git configuration value.  An optional second
-" 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, ''))
-endfunction
-
-" FugitiveConfigGetAll() is like FugitiveConfigGet() but returns a list of
-" all values.
-function! FugitiveConfigGetAll(name, ...) abort
-  return call('fugitive#ConfigGetAll', [a:name] + a:000)
-endfunction
-
-" FugitiveConfigGetRegexp() retrieves a dictionary of all configuration values
-" with a key matching the given pattern.  Like git config --get-regexp, but
-" using a Vim regexp.  Second argument has same semantics as
-" FugitiveConfigGet().
-function! FugitiveConfigGetRegexp(pattern, ...) abort
-  return call('fugitive#ConfigGetRegexp', [a:pattern] + a:000)
-endfunction
-
-" FugitiveRemoteUrl() retrieves the remote URL for the given remote name,
-" defaulting to the current branch's remote or "origin" if no argument is
-" given.  Similar to `git remote get-url`, but also attempts to resolve HTTP
-" redirects and SSH host aliases.
-"
-" An optional second argument provides the Git dir, or the buffer number of a
-" buffer with a Git dir.  The default is the current buffer.
-function! FugitiveRemoteUrl(...) abort
-  return call('fugitive#RemoteUrl', a:000)
-endfunction
-
-" FugitiveDidChange() triggers a FugitiveChanged event and reloads the summary
-" buffer for the current or given buffer number's repository.  You can also
-" give the result of a FugitiveExecute() and that context will be made
-" available inside the FugitiveChanged() event.
-"
-" Passing the special argument 0 (the number zero) softly expires summary
-" buffers for all repositories.  This can be used after a call to system()
-" with unclear implications.
-function! FugitiveDidChange(...) abort
-  return call('fugitive#DidChange', a:000)
-endfunction
-
-" FugitiveHead() retrieves the name of the current branch. If the current HEAD
-" is detached, FugitiveHead() will return the empty string, unless the
-" optional argument is given, in which case the hash of the current commit
-" will be truncated to the given number of characters.
-"
-" An optional second argument provides the Git dir, or the buffer number of a
-" buffer with a Git dir.  The default is the current buffer.
-function! FugitiveHead(...) abort
-  if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type('') && a:1 !~# '^\d\+$')
-    let dir = FugitiveGitDir(a:1)
-    let arg = get(a:, 2, 0)
-  elseif a:0 > 1
-    let dir = FugitiveGitDir(a:2)
-    let arg = a:1
+  if a:0 == 2 && type(a:2) != type({})
+    return fugitive#Config(a:1, FugitiveGitDir(a:2))
+  elseif a:0 == 1 && a:1 !~# '^[[:alnum:]-]\+\.'
+    return fugitive#Config(FugitiveGitDir(a:1))
   else
-    let dir = FugitiveGitDir()
-    let arg = get(a:, 1, 0)
+    return call('fugitive#Config', a:000)
   endif
+endfunction
+
+function! FugitiveRemoteUrl(...) abort
+  return fugitive#RemoteUrl(a:0 ? a:1 : '', FugitiveGitDir(a:0 > 1 ? a:2 : -1))
+endfunction
+
+function! FugitiveHead(...) abort
+  let dir = FugitiveGitDir(a:0 > 1 ? a:2 : -1)
   if empty(dir)
     return ''
   endif
-  return fugitive#Head(arg, dir)
-endfunction
-
-function! FugitivePath(...) abort
-  if a:0 > 2 && type(a:1) ==# type({})
-    return fugitive#Path(a:2, a:3, FugitiveGitDir(a:1))
-  elseif a:0 && type(a:1) ==# type({})
-    return FugitiveReal(a:0 > 1 ? a:2 : @%)
-  elseif a:0 > 1
-    return fugitive#Path(a:1, a:2, FugitiveGitDir(a:0 > 2 ? a:3 : -1))
-  else
-    return FugitiveReal(a:0 ? a:1 : @%)
-  endif
+  return fugitive#Head(a:0 ? a:1 : 0, dir)
 endfunction
 
 function! FugitiveStatusline(...) abort
-  if empty(get(b:, 'git_dir', ''))
+  if !exists('b:git_dir')
     return ''
   endif
   return fugitive#Statusline()
@@ -270,24 +127,16 @@ function! FugitiveCommonDir(...) abort
   if empty(dir)
     return ''
   endif
-  return fugitive#Find('.git/refs/..', dir)
+  return fugitive#CommonDir(dir)
 endfunction
 
 function! FugitiveWorkTree(...) abort
-  let tree = s:Tree(FugitiveGitDir(a:0 ? a:1 : -1))
-  if tree isnot# 0 || a:0 > 1
-    return tree
-  else
-    return ''
-  endif
+  return s:Tree(FugitiveGitDir(a:0 ? a:1 : -1))
 endfunction
 
-function! FugitiveIsGitDir(...) abort
-  if !a:0 || type(a:1) !=# type('')
-    return !empty(call('FugitiveGitDir', a:000))
-  endif
-  let path = substitute(a:1, '[\/]$', '', '') . '/'
-  return len(path) && getfsize(path.'HEAD') > 10 && (
+function! FugitiveIsGitDir(path) abort
+  let path = substitute(a:path, '[\/]$', '', '') . '/'
+  return len(a:path) && getfsize(path.'HEAD') > 10 && (
         \ isdirectory(path.'objects') && isdirectory(path.'refs') ||
         \ getftype(path.'commondir') ==# 'file')
 endfunction
@@ -306,14 +155,9 @@ function! s:Tree(path) abort
     let config_file = dir . '/config'
     if filereadable(config_file)
       let config = readfile(config_file,'',10)
-      let wt_config = filter(copy(config),'v:val =~# "^\\s*worktree *="')
-      if len(wt_config) == 1
-        let worktree = FugitiveVimPath(matchstr(wt_config[0], '= *\zs.*'))
-      else
-        call filter(config,'v:val =~# "^\\s*bare *= *false *$"')
-        if len(config)
-          let s:worktree_for_dir[dir] = 0
-        endif
+      call filter(config,'v:val =~# "^\\s*worktree *="')
+      if len(config) == 1
+        let worktree = FugitiveVimPath(matchstr(config[0], '= *\zs.*'))
       endif
     elseif filereadable(dir . '/gitdir')
       let worktree = fnamemodify(FugitiveVimPath(readfile(dir . '/gitdir')[0]), ':h')
@@ -351,13 +195,7 @@ function! s:CeilingDirectories() abort
 endfunction
 
 function! FugitiveExtractGitDir(path) abort
-  if type(a:path) ==# type({})
-    return get(a:path, 'git_dir', '')
-  elseif type(a:path) == type(0)
-    let path = s:Slash(a:path >= 0 ? bufname(a:path) : bufname(''))
-  else
-    let path = s:Slash(a:path)
-  endif
+  let path = s:Slash(a:path)
   if path =~# '^fugitive:'
     return matchstr(path, '\C^fugitive:\%(//\)\=\zs.\{-\}\ze\%(//\|::\|$\)')
   elseif empty(path)
@@ -413,33 +251,19 @@ function! FugitiveExtractGitDir(path) abort
   return ''
 endfunction
 
-function! FugitiveDetect(...) abort
-  if v:version < 703
-    return ''
-  endif
-  if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
+function! FugitiveDetect(path) abort
+  if exists('b:git_dir') && b:git_dir =~# '^$\|/$\|^fugitive:'
     unlet b:git_dir
   endif
   if !exists('b:git_dir')
-    let b:git_dir = FugitiveExtractGitDir(a:0 ? a:1 : bufnr(''))
+    let dir = FugitiveExtractGitDir(a:path)
+    if dir !=# ''
+      let b:git_dir = dir
+    endif
   endif
-  if empty(b:git_dir) || !exists('#User#Fugitive')
-    return ''
+  if exists('b:git_dir')
+    return fugitive#Init()
   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
 
 function! FugitiveVimPath(path) abort
@@ -454,15 +278,13 @@ function! FugitiveGitPath(path) abort
   return s:Slash(a:path)
 endfunction
 
-if exists('+shellslash')
-  function! s:Slash(path) abort
+function! s:Slash(path) abort
+  if exists('+shellslash')
     return tr(a:path, '\', '/')
-  endfunction
-else
-  function! s:Slash(path) abort
+  else
     return a:path
-  endfunction
-endif
+  endif
+endfunction
 
 function! s:ProjectionistDetect() abort
   let file = s:Slash(get(g:, 'projectionist_file', ''))
@@ -471,7 +293,7 @@ function! s:ProjectionistDetect() abort
   if empty(base)
     let base = s:Tree(dir)
   endif
-  if !empty(base)
+  if len(base)
     if exists('+shellslash') && !&shellslash
       let base = tr(base, '/', '\')
     endif
@@ -482,104 +304,9 @@ function! s:ProjectionistDetect() abort
   endif
 endfunction
 
-let s:addr_other = has('patch-8.1.560') || has('nvim-0.5.0') ? '-addr=other' : ''
-let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
-let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
-
-if exists(':G') != 2
-  command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete G   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
+if v:version + has('patch061') < 703
+  runtime! autoload/fugitive.vim
 endif
-command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete Git exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
-
-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']
-  if exists(':G' . tolower(s:cmd)) != 2 && get(g:, 'fugitive_legacy_commands', 0)
-    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
-
-exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd  exe fugitive#Cd(<q-args>, 0)"
-exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd exe fugitive#Cd(<q-args>, 1)"
-
-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")'
-exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GlLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
-
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>, [<f-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>, [<f-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>, [<f-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>, [<f-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>, [<f-args>])'
-endif
-exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gread    exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit  exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vertical <mods>", <q-args>, [<f-args>])'
-
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw     exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq    exe fugitive#WqCommand(   <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-
-exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-        \ '|echohl WarningMSG|echomsg ":Gremove is deprecated in favor of :GRemove"|echohl NONE'
-endif
-if exists(':Gdelete') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-        \ '|echohl WarningMSG|echomsg ":Gdelete is deprecated in favor of :GDelete"|echohl NONE'
-endif
-if exists(':Gmove') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-        \ '|echohl WarningMSG|echomsg ":Gmove is deprecated in favor of :GMove"|echohl NONE'
-endif
-if exists(':Grename') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-        \ '|echohl WarningMSG|echomsg ":Grename is deprecated in favor of :GRename"|echohl NONE'
-endif
-
-exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject GBrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-if exists(':Gbrowse') != 2 && get(g:, 'fugitive_legacy_commands', 1)
-  exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
-        \ '|if <bang>1|redraw!|endif|echohl WarningMSG|echomsg ":Gbrowse is deprecated in favor of :GBrowse"|echohl NONE'
-endif
-
-if v:version < 703
-  finish
-endif
-
 let g:io_fugitive = {
       \ 'simplify': function('fugitive#simplify'),
       \ 'resolve': function('fugitive#resolve'),
@@ -604,20 +331,23 @@ augroup fugitive
   autocmd FileType           netrw call FugitiveDetect(fnamemodify(get(b:, 'netrw_curdir', expand('<amatch>')), ':p'))
 
   autocmd FileType git
-        \ call fugitive#MapCfile()
+        \ if len(FugitiveGitDir()) |
+        \   call fugitive#MapJumps() |
+        \   call fugitive#MapCfile() |
+        \ endif
   autocmd FileType gitcommit
-        \ call fugitive#MapCfile('fugitive#MessageCfile()')
-  autocmd FileType git,gitcommit
-        \ if &foldtext ==# 'foldtext()' |
-        \    setlocal foldtext=fugitive#Foldtext() |
+        \ if len(FugitiveGitDir()) |
+        \   call fugitive#MapCfile('fugitive#MessageCfile()') |
         \ endif
   autocmd FileType fugitive
-        \ call fugitive#MapCfile('fugitive#PorcelainCfile()')
+        \ if len(FugitiveGitDir()) |
+        \   call fugitive#MapCfile('fugitive#StatusCfile()') |
+        \ endif
   autocmd FileType gitrebase
         \ let &l:include = '^\%(pick\|squash\|edit\|reword\|fixup\|drop\|[pserfd]\)\>' |
-        \ if &l:includeexpr !~# 'Fugitive' |
-        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' && len(FugitiveGitDir()) ? FugitiveFind(v:fname) : ' .
-        \     (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
+        \ if len(FugitiveGitDir()) |
+        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' ? FugitiveFind(v:fname) : ' .
+        \   (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
         \ endif |
         \ let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|setl inex= inc='
 
@@ -650,6 +380,62 @@ augroup fugitive
   autocmd User ProjectionistDetect call s:ProjectionistDetect()
 augroup END
 
+let s:addr_other = has('patch-8.1.560') ? '-addr=other' : ''
+let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
+let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#Complete G   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#Complete Git exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#CommitComplete Gcommit exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "commit " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#RevertComplete Grevert exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "revert " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#MergeComplete  Gmerge  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "merge " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#RebaseComplete Grebase exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "rebase " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#PullComplete   Gpull   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "pull " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#PushComplete   Gpush   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "push " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_other '-complete=customlist,fugitive#FetchComplete  Gfetch  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "fetch " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1                -complete=customlist,fugitive#BlameComplete  Gblame  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "blame " . <q-args>)'
+
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd  exe fugitive#Cd(<q-args>, 0)"
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd exe fugitive#Cd(<q-args>, 1)"
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep  exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "grep " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Gcgrep exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "grep " . <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#Command(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", "grep " . <q-args>)'
+
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
+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")'
+
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>, [<f-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>, [<f-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>, [<f-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>, [<f-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>, [<f-args>])'
+endif
+exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gread    exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit  exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vert <mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw     exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq    exe fugitive#WqCommand(   <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=0 -complete=customlist,fugitive#CompleteObject Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
+exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>, [<f-args>])'
+
 if get(g:, 'fugitive_no_maps')
   finish
 endif

syntax/fugitive.vim

@@ -7,11 +7,7 @@ syn spell notoplevel
 
 syn include @fugitiveDiff syntax/diff.vim
 
-syn match fugitiveHeader /^[A-Z][a-z][^:]*:/
-syn match fugitiveHeader /^Head:/ nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
-syn match fugitiveHeader /^Pull:\|^Rebase:\|^Merge:\|^Push:/ nextgroup=fugitiveSymbolicRef skipwhite
-syn match fugitiveHelpHeader /^Help:/ nextgroup=fugitiveHelpTag skipwhite
-syn match fugitiveHelpTag    /\S\+/ contained
+syn match fugitiveHeader /^[A-Z][a-z][^:]*:/ nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
 
 syn region fugitiveSection start=/^\%(.*(\d\+)$\)\@=/ contains=fugitiveHeading end=/^$/
 syn cluster fugitiveSection contains=fugitiveSection
@@ -24,10 +20,10 @@ syn match fugitiveDone /^done\>/ contained containedin=@fugitiveSection nextgrou
 syn match fugitiveStop /^stop\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
 syn match fugitiveModifier /^[MADRCU?]\{1,2} / contained containedin=@fugitiveSection
 syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@<!/ contained
-syn match fugitiveHash /^\x\{4,\}\S\@!/ contained containedin=@fugitiveSection
-syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
+syn match fugitiveHash /^\x\{4,\}\>/ contained containedin=@fugitiveSection
+syn match fugitiveHash /\<\x\{4,\}\>/ contained
 
-syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=diffLine,diffRemoved,diffAdded,diffNoEOL containedin=@fugitiveSection fold
+syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=@fugitiveDiff 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=/^$/'
@@ -37,9 +33,7 @@ for s:section in ['Untracked', 'Unstaged', 'Staged']
 endfor
 unlet s:section
 
-hi def link fugitiveHelpHeader fugitiveHeader
 hi def link fugitiveHeader Label
-hi def link fugitiveHelpTag Tag
 hi def link fugitiveHeading PreProc
 hi def link fugitiveUntrackedHeading PreCondit
 hi def link fugitiveUnstagedHeading Macro

syntax/fugitiveblame.vim

@@ -1,4 +1,4 @@
-if exists("b:current_syntax") || !exists("*FugitiveGitDir")
+if exists("b:current_syntax")
   finish
 endif