motiejus/dotfiles

commit 6ae064c5aa1cc24c78abc8d12ec236e99dc01316 (tree)
parent 798f65a1808284e878fd5db1f915f98a638fd548
Author: Tim Pope <code@tpope.net>
Date:   Thu, 27 May 2021 10:33:06 -0400

Tighten match for commit under cursor in temp buffers

Closes https://github.com/tpope/vim-fugitive/issues/1756

Diffstat:
M
autoload/fugitive.vim
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -6409,7 +6409,7 @@ function! s:SquashArgument(...) abort
   if &filetype == 'fugitive'
     let commit = matchstr(getline('.'), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze \|^' . s:ref_header . ': \zs\S\+')
   elseif has_key(s:temp_files, s:cpath(expand('%:p')))
-    let commit = matchstr(getline('.'), '\<\x\{4,\}\>')
+    let commit = matchstr(getline('.'), '\S\@<!\x\{4,\}\>')
   else
     let commit = s:Owner(@%)
   endif