Merge pull request #795 from shanedasilva/add_commit_hash_to_blame_result

Add commit hash to blame result

2 files changed, 10 insertions, 2 deletions

diff --git a/blame.go b/blame.go
index 3c5840f..349cdd9 100644
--- a/blame.go
+++ b/blame.go
@@ -109,12 +109,15 @@ type Line struct {
 	Text string
 	// Date is when the original text of the line was introduced
 	Date time.Time
+	// Hash is the commit hash that introduced the original line
+	Hash plumbing.Hash
 }
 
-func newLine(author, text string, date time.Time) *Line {
+func newLine(author, text string, date time.Time, hash plumbing.Hash) *Line {
 	return &Line{
 		Author: author,
 		Text:   text,
+		Hash:   hash,
 		Date:   date,
 	}
 }
@@ -125,7 +128,7 @@ func newLines(contents []string, commits []*object.Commit) ([]*Line, error) {
 	}
 	result := make([]*Line, 0, len(contents))
 	for i := range contents {
-		l := newLine(commits[i].Author.Email, contents[i], commits[i].Author.When)
+		l := newLine(commits[i].Author.Email, contents[i], commits[i].Author.When, commits[i].Hash)
 		result = append(result, l)
 	}
 	return result, nil
diff --git a/blame_test.go b/blame_test.go
index 51c546a..92911b1 100644
--- a/blame_test.go
+++ b/blame_test.go
@@ -32,6 +32,10 @@ func (s *BlameSuite) TestBlame(c *C) {
 		obt, err := Blame(commit, t.path)
 		c.Assert(err, IsNil)
 		c.Assert(obt, DeepEquals, exp)
+
+		for i, l := range obt.Lines {
+			c.Assert(l.Hash.String(), Equals, t.blames[i])
+		}
 	}
 }
 
@@ -54,6 +58,7 @@ func (s *BlameSuite) mockBlame(c *C, t blameTest, r *Repository) (blame *BlameRe
 			Author: commit.Author.Email,
 			Text:   lines[i],
 			Date:   commit.Author.When,
+			Hash:   commit.Hash,
 		}
 		blamedLines = append(blamedLines, l)
 	}