From 5dd8ab6211a392f8e69f75ae75d9ab4af76303eb Mon Sep 17 00:00:00 2001
From: Andy Stewart <boss@airbladesoftware.com>
Date: Mon, 25 Apr 2022 13:33:45 +0100
Subject: [PATCH] Fix parsing of 'git ls-files -v' for filenames with spaces

Fixes #829.
---
 autoload/gitgutter/utility.vim |  6 ++++--
 test/test_gitgutter.vim        | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/autoload/gitgutter/utility.vim b/autoload/gitgutter/utility.vim
index d053267..a2aa64e 100644
--- a/autoload/gitgutter/utility.vim
+++ b/autoload/gitgutter/utility.vim
@@ -118,7 +118,8 @@ endfunction
 let s:set_path_handler = {}
 
 function! s:set_path_handler.out(buffer, listing) abort
-  let [status, path] = split(s:strip_trailing_new_line(a:listing))
+  let listing = s:strip_trailing_new_line(a:listing)
+  let [status, path] = [listing[0], listing[2:]]
   if status =~ '[[:lower:]]'
     call gitgutter#utility#setbufvar(a:buffer, 'path', -3)
   else
@@ -167,7 +168,8 @@ function! gitgutter#utility#set_repo_path(bufnr, continuation) abort
     return
   endif
 
-  let [status, path] = split(s:strip_trailing_new_line(listing))
+  let listing = s:strip_trailing_new_line(listing)
+  let [status, path] = [listing[0], listing[2:]]
   if status =~ '[[:lower:]]'
     call gitgutter#utility#setbufvar(a:bufnr, 'path', -3)
   else
diff --git a/test/test_gitgutter.vim b/test/test_gitgutter.vim
index 595c254..412b15f 100644
--- a/test/test_gitgutter.vim
+++ b/test/test_gitgutter.vim
@@ -205,6 +205,20 @@ function Test_filename_with_square_brackets()
 endfunction
 
 
+function Test_filename_with_space()
+  call system('touch fix\ ture.txt && git add fix\ ture.txt')
+  edit fix\ ture.txt
+  normal ggo*
+  call s:trigger_gitgutter()
+
+  let expected = [
+        \ {'lnum': 1, 'name': 'GitGutterLineAdded'},
+        \ {'lnum': 2, 'name': 'GitGutterLineAdded'}
+        \ ]
+  call s:assert_signs(expected, 'fix\ ture.txt')
+endfunction
+
+
 function Test_filename_leading_dash()
   call system('touch -- -fixture.txt && git add -- -fixture.txt')
   edit -fixture.txt