Merge commit 'amjith/master'

Conflicts: plugin/git.vim
weierophinney · Sep 8, 2009 · cb110a2 · cb110a2
2 parents 022fb41 + 4421506
commit cb110a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plugin/git.vim b/plugin/git.vim
@@ -49,8 +49,8 @@ endfunction
 function! GitBranch()
     let git_dir = <SID>GetGitDir()
 
-    if strlen(git_dir) && filereadable(git_dir . 'HEAD')
+    if strlen(git_dir) && filereadable(git_dir . '/HEAD')
-        let lines = readfile(git_dir . 'HEAD')
+        let lines = readfile(git_dir . '/HEAD')
         if !len(lines)
             return ''
         else