From 4da9fb8f43869125f6e1bb1ff8dd27f315623835 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sat, 13 Jul 2019 07:45:30 -0400
Subject: [PATCH] Guard against empty filename checking for conflicts

Closes https://github.com/tpope/vim-fugitive/issues/1287
---
 autoload/fugitive.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 876aa5d..cac5705 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -3995,7 +3995,7 @@ function! s:CompareAge(mine, theirs) abort
 endfunction
 
 function! s:IsConflicted() abort
-  return !empty(s:TreeChomp('ls-files', '--unmerged', '--', expand('%:p')))
+  return len(@%) && !empty(s:ChompDefault('', 'ls-files', '--unmerged', '--', expand('%:p')))
 endfunction
 
 function! s:Diff(autodir, keepfocus, mods, ...) abort