From 3383badda5e2fd3ad9536f90b75e788af4931c0f Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Thu, 3 Jan 2019 12:18:53 -0500
Subject: [PATCH] Don't stage/unstage from unstage/stage maps

This needs count and visual selection support.
---
 autoload/fugitive.vim | 13 +++++++++++--
 doc/fugitive.txt      |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 0c63c42..847f790 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1519,9 +1519,9 @@ function! fugitive#BufReadStatus() abort
     nnoremap <buffer> <silent> <C-P> :<C-U>execute <SID>StagePrevious(v:count1)<CR>
     exe "nnoremap <buffer> <silent>" nowait "- :<C-U>execute <SID>StageToggle(line('.'),v:count)<CR>"
     exe "xnoremap <buffer> <silent>" nowait "- :<C-U>execute <SID>StageToggle(line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>"
-    exe "nnoremap <buffer> <silent>" nowait "s :<C-U>execute <SID>StageToggle(line('.'),v:count)<CR>"
+    exe "nnoremap <buffer> <silent>" nowait "s :<C-U>execute <SID>StageToggleOnly('Unstaged',line('.'),v:count)<CR>"
     exe "xnoremap <buffer> <silent>" nowait "s :<C-U>execute <SID>StageToggle(line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>"
-    exe "nnoremap <buffer> <silent>" nowait "u :<C-U>execute <SID>StageToggle(line('.'),v:count)<CR>"
+    exe "nnoremap <buffer> <silent>" nowait "u :<C-U>execute <SID>StageToggleOnly('Staged',line('.'),v:count)<CR>"
     exe "xnoremap <buffer> <silent>" nowait "u :<C-U>execute <SID>StageToggle(line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>"
     nnoremap <buffer> <silent> C :<C-U>Gcommit<CR>:echohl WarningMsg<Bar>echo ':Gstatus C is deprecated in favor of cc'<Bar>echohl NONE<CR>
     nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR>
@@ -2334,6 +2334,15 @@ function! s:StageToggle(lnum1, count) abort
   return ''
 endfunction
 
+function! s:StageToggleOnly(section, lnum1, count) abort
+  let info = s:StageInfo(a:lnum1)
+  if info.section ==# a:section
+    return s:StageToggle(a:lnum1, a:count)
+  else
+    return s:StageNext(a:count ? a:count : 1)
+  endif
+endfunction
+
 function! s:StagePatch(lnum1,lnum2) abort
   let add = []
   let reset = []
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index a781f18..3cef9f1 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -62,6 +62,8 @@ that are part of Git repositories).
                         o     |:Gsplit|
                         P     |:Git| add --patch
                         P     |:Git| reset --patch (staged files)
+                        s     |:Git| add
+                        u     |:Git| reset
                         X     |:Git| checkout
                         X     |:Git| checkout HEAD (staged files)
                         X     |:Git| clean (untracked files)