update git vendor (#4059) (#4075)

* update git vendor (#4059)

* fix errors resulting from git vendor update

* fmt
This commit is contained in:
David Schneiderbauer
2018-06-04 22:33:42 +02:00
committed by Lauris BH
parent 561f459364
commit 1b10bc0cdf
12 changed files with 265 additions and 117 deletions

View File

@@ -4,7 +4,21 @@
package git
import "fmt"
// FileBlame return the Blame object of file
func (repo *Repository) FileBlame(revision, path, file string) ([]byte, error) {
return NewCommand("blame", "--root", file).RunInDirBytes(path)
return NewCommand("blame", "--root", "--", file).RunInDirBytes(path)
}
// LineBlame returns the latest commit at the given line
func (repo *Repository) LineBlame(revision, path, file string, line uint) (*Commit, error) {
res, err := NewCommand("blame", fmt.Sprintf("-L %d,%d", line, line), "-p", revision, "--", file).RunInDir(path)
if err != nil {
return nil, err
}
if len(res) < 40 {
return nil, fmt.Errorf("invalid result of blame: %s", res)
}
return repo.GetCommit(string(res[:40]))
}