From 6058fe1210280a871be1566afe0f546edb9eb88e Mon Sep 17 00:00:00 2001 From: Marwan Al Jubeh Date: Tue, 29 Nov 2011 00:22:56 +0200 Subject: [PATCH] 'git submodule update' needs --merge or --rebase, otherwise it will result in a detached HEAD. --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 16b13bf..d4e78d8 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -221,7 +221,7 @@ func! s:sync(bang, bundle) abort let relative_path = prefix.substitute(a:bundle.path(), g:bundle_dir.'/', '', '') if isdirectory(git_dir) if !(a:bang) | return 'todate' | endif - let cmd = 'cd '.shellescape(top_level).' && git submodule update '.shellescape(relative_path) + let cmd = 'cd '.shellescape(top_level).' && git submodule update --merge '.shellescape(relative_path) else let cmd = 'cd '.shellescape(top_level).' && git submodule add '.a:bundle.uri.' '.shellescape(relative_path).' && git submodule init' endif