From a6e14e1cfb7e609b6e15bfd74e11104ba9a00f99 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 15 Apr 2022 23:56:31 +0800 Subject: [PATCH] fix(git): fix git branch info --- autoload/SpaceVim/layers/VersionControl.vim | 2 +- bundle/git.vim/autoload/git/branch.vim | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/autoload/SpaceVim/layers/VersionControl.vim b/autoload/SpaceVim/layers/VersionControl.vim index 8c5c77e14..b8af193cf 100644 --- a/autoload/SpaceVim/layers/VersionControl.vim +++ b/autoload/SpaceVim/layers/VersionControl.vim @@ -91,7 +91,7 @@ function! s:git_branch() abort endtry elseif exists('g:loaded_git') try - let head = '%{git#branch#current()}' + let head = git#branch#current() if g:spacevim_statusline_unicode == 1 return empty(head) ? '' : '  '.head . ' ' . s:gtm_status() else diff --git a/bundle/git.vim/autoload/git/branch.vim b/bundle/git.vim/autoload/git/branch.vim index 5ad311291..d455bf84c 100644 --- a/bundle/git.vim/autoload/git/branch.vim +++ b/bundle/git.vim/autoload/git/branch.vim @@ -91,6 +91,9 @@ endfunction function! s:on_exit_show_branch(id, data, event) abort let pwd = get(s:job_pwds, 'jobid' . a:id, '') + if !has_key(s:branch_info, pwd) + let s:branch_info[pwd] = {} + endif call extend(s:branch_info[pwd], { \ 'last_update_done' : localtime(), \ })