From b92de0138d66c54be818f87138750fe5b680355a Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Mon, 22 Jul 2019 14:34:54 -0400
Subject: [PATCH] Provide rudimentary stash mappings

---
 autoload/fugitive.vim | 11 ++++++++++-
 doc/fugitive.txt      | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index c8b8578..18cc924 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -487,7 +487,7 @@ function! fugitive#RevParse(rev, ...) abort
   if !exec_error && hash =~# '^\x\{40,\}$'
     return hash
   endif
-  call s:throw('rev-parse '.a:rev.': '.hash)
+  throw 'vim-fugitive: rev-parse '.a:rev.': '.hash
 endfunction
 
 function! s:ConfigTimestamps(dir, dict) abort
@@ -4898,6 +4898,15 @@ function! fugitive#MapJumps(...) abort
     nnoremap <buffer>          cA    :<C-U>Gcommit --edit --squash=<C-R>=<SID>SquashArgument()<CR>
     nnoremap <buffer> <silent> c?    :<C-U>help fugitive_c<CR>
 
+    nnoremap <buffer>      cz<Space> :G stash<Space>
+    nnoremap <buffer>         cz<CR> :G stash<CR>
+    nnoremap <buffer> <silent> cza   :<C-U>exe <SID>EchoExec(['stash', 'apply', '--quiet', 'stash@{' . v:count . '}'])<CR>
+    nnoremap <buffer> <silent> czp   :<C-U>exe <SID>EchoExec(['stash', 'pop', '--quiet', 'stash@{' . v:count . '}'])<CR>
+    nnoremap <buffer> <silent> czv   :<C-U>exe 'Gedit' fugitive#RevParse('stash@{' . v:count . '}')<CR>
+    nnoremap <buffer> <silent> czw   :<C-U>exe <SID>EchoExec(['stash', '--keep-index'] + (v:count > 1 ? ['--all'] : v:count ? ['--include-untracked'] : []))<CR>
+    nnoremap <buffer> <silent> czz   :<C-U>exe <SID>EchoExec(['stash'] + (v:count > 1 ? ['--all'] : v:count ? ['--include-untracked'] : []))<CR>
+    nnoremap <buffer> <silent> cz?   :<C-U>help fugitive_cz<CR>
+
     nnoremap <buffer>          r-    :Grebase -
     nnoremap <buffer>       r<Space> :Grebase<Space>
     nnoremap <buffer>          r<CR> :Grebase<CR>
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index 357cd6c..6437902 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -384,6 +384,21 @@ cA                      Create a `squash!` commit for the commit under the
 
 c?                      Show this help.
 
+                                                *fugitive_cz*
+Stash mappings ~
+
+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
+                        `--include-index`.
+
+cza                     Apply topmost stash, or stash@{count}.
+
+czp                     Pop topmost stash, or stash@{count}.
+
+cz?                     Show this help.
+
                                                 *fugitive_r*
 Rebase mappings ~