diff options
| author | Santiago M. Mola <santi@mola.io> | 2016-12-14 23:12:44 +0100 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2016-12-14 23:12:44 +0100 |
| commit | 0af572dd21c0aa79d13745b633ee24ba6c4d6cf1 (patch) | |
| tree | 49e81e74e82d84fd88b2fc1e4b0dc7c7bfe9c40f /blame_test.go | |
| parent | df0f38af83f972f026d7e14150f3d37b95f13484 (diff) | |
| download | go-git-0af572dd21c0aa79d13745b633ee24ba6c4d6cf1.tar.gz | |
move plumbing from top level package to plumbing (#183)
* plumbing: rename Object -> EncodedObject.
* plumbing/storer: rename ObjectStorer -> EncodedObjectStorer.
* move difftree to plumbing/difftree.
* move diff -> utils/diff
* make Object/Tag/Blob/Tree/Commit/File depend on storer.
* Object and its implementations now depend only on
storer.EncodedObjectStorer, not git.Repository.
* Tests are decoupled accordingly.
* move Object/Commit/File/Tag/Tree to plumbing/object.
* move Object/Commit/File/Tag/Tree to plumbing/object.
* move checkClose to utils/ioutil.
* move RevListObjects to plumbing/revlist.Objects.
* move DiffTree to plumbing/difftree package.
* rename files with plural nouns to singular
* plumbing/object: add GetBlob/GetCommit/GetTag/GetTree.
Diffstat (limited to 'blame_test.go')
| -rw-r--r-- | blame_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blame_test.go b/blame_test.go index f4203b8..1ff430e 100644 --- a/blame_test.go +++ b/blame_test.go @@ -29,13 +29,13 @@ func (s *BlameSuite) TestBlame(c *C) { commit, err := r.Commit(plumbing.NewHash(t.rev)) c.Assert(err, IsNil) - obt, err := commit.Blame(t.path) + obt, err := Blame(commit, t.path) c.Assert(err, IsNil) c.Assert(obt, DeepEquals, exp) } } -func (s *BlameSuite) mockBlame(c *C, t blameTest, r *Repository) (blame *Blame) { +func (s *BlameSuite) mockBlame(c *C, t blameTest, r *Repository) (blame *BlameResult) { commit, err := r.Commit(plumbing.NewHash(t.rev)) c.Assert(err, IsNil, Commentf("%v: repo=%s, rev=%s", err, t.repo, t.rev)) @@ -57,7 +57,7 @@ func (s *BlameSuite) mockBlame(c *C, t blameTest, r *Repository) (blame *Blame) blamedLines = append(blamedLines, l) } - return &Blame{ + return &BlameResult{ Path: t.path, Rev: plumbing.NewHash(t.rev), Lines: blamedLines, |