diff options
| author | Mateusz Byczkowski <mbyczkowski@gmail.com> | 2017-02-02 10:51:24 -0800 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-02-02 19:51:24 +0100 |
| commit | a3344f15a67a67ed65f228db49e74fd390852e77 (patch) | |
| tree | a7c4e696164f7d0976efe65fa6a333927eb7217a /worktree.go | |
| parent | fa35e5c2372f8a103aa0ab8baa13116a25abd03a (diff) | |
| download | go-git-a3344f15a67a67ed65f228db49e74fd390852e77.tar.gz | |
Fix compile-time error on Windows (#251)
syscall.Stat_t it not defined on Windows platform, and hence go-git
won't compile on Windows. It's better to pass more generic output of FileInfo `Sys()`
(of type interface{}) to `fillSystemInfo` and handle type assertion
separately for each platform.
Diffstat (limited to 'worktree.go')
| -rw-r--r-- | worktree.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/worktree.go b/worktree.go index 83e3bd3..7b47650 100644 --- a/worktree.go +++ b/worktree.go @@ -5,7 +5,6 @@ import ( "fmt" "io" "os" - "syscall" "srcd.works/go-git.v4/plumbing" "srcd.works/go-git.v4/plumbing/format/index" @@ -71,7 +70,7 @@ func (w *Worktree) checkoutFile(f *object.File, idx *index.Index) error { return w.indexFile(f, idx) } -var fillSystemInfo func(e *index.Entry, os *syscall.Stat_t) +var fillSystemInfo func(e *index.Entry, sys interface{}) func (w *Worktree) indexFile(f *object.File, idx *index.Index) error { fi, err := w.fs.Stat(f.Name) @@ -89,9 +88,8 @@ func (w *Worktree) indexFile(f *object.File, idx *index.Index) error { // if the FileInfo.Sys() comes from os the ctime, dev, inode, uid and gid // can be retrieved, otherwise this doesn't apply - os, ok := fi.Sys().(*syscall.Stat_t) - if ok && fillSystemInfo != nil { - fillSystemInfo(&e, os) + if fillSystemInfo != nil { + fillSystemInfo(&e, fi.Sys()) } idx.Entries = append(idx.Entries, e) |