Commit 8dc9134

committed

fix git directory detection inside /.git/modules/ (fix #8)

1 parent 8118dc1 commit 8dc9134Copy full SHA for 8dc9134

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`" Filename: autoload/gitbranch.vim`
`3`	`3`	`" Author: itchyny`
`4`	`4`	`" License: MIT License`
`5`		`-" Last Change: 2015年02月26日 00:34:03.`
	`5`	`+" Last Change: 2021年08月20日 23:05:12.`
`6`	`6`	`" =============================================================================`
`7`	`7`
`8`	`8`	`let s:save_cpo = &cpo`
`@@ -26,6 +26,7 @@ endfunction`
`26`	`26`	`function! gitbranch#dir(path) abort`
`27`	`27`	`let path = a:path`
`28`	`28`	`let prev = ''`
	`29`	`+ let git_modules = path =~# '/\.git/modules/'`
`29`	`30`	`while path !=# prev`
`30`	`31`	`let dir = path . '/.git'`
`31`	`32`	`let type = getftype(dir)`
`@@ -36,6 +37,8 @@ function! gitbranch#dir(path) abort`
`36`	`37`	`if reldir =~# '^gitdir: '`
`37`	`38`	`return simplify(path . '/' . reldir[8:])`
`38`	`39`	`endif`
	`40`	`+ elseif git_modules && isdirectory(path.'/objects') && isdirectory(path.'/refs') && getfsize(path.'/HEAD') > 10`
	`41`	`+ return path`
`39`	`42`	`endif`
`40`	`43`	`let prev = path`
`41`	`44`	`let path = fnamemodify(path, ':h')`

Comments

(0)