summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Straub <bs@github.com>2014-01-08 19:43:31 -0800
committerBen Straub <bs@github.com>2014-01-08 19:43:31 -0800
commit426d8456ea979cfae401ced2f88cc811a8b8264a (patch)
tree7c58d3ab42752ba14e6511b156ab5cc38628a4eb /src
parentcc3d961bd949f11ad90fd4bb513bbc089f6cb61a (diff)
parentb92b434f5a240a8c149bcf86bbcd1743cd873bcf (diff)
downloadlibgit2-426d8456ea979cfae401ced2f88cc811a8b8264a.tar.gz
Merge pull request #2033 from xtao/blame_orig_commit
Add orig_commit.
Diffstat (limited to 'src')
-rw-r--r--src/blame.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/blame.c b/src/blame.c
index a1357415a..45f55ed14 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -242,7 +242,7 @@ static int index_blob_lines(git_blame *blame)
git_off_t len = blame->final_buf_size;
int num = 0, incomplete = 0, bol = 1;
size_t *i;
-
+
if (len && buf[len-1] != '\n')
incomplete++; /* incomplete line at the end */
while (len--) {
@@ -263,13 +263,15 @@ static int index_blob_lines(git_blame *blame)
blame->num_lines = num + incomplete;
return blame->num_lines;
}
-
+
static git_blame_hunk* hunk_from_entry(git_blame__entry *e)
{
git_blame_hunk *h = new_hunk(
e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path);
git_oid_cpy(&h->final_commit_id, git_commit_id(e->suspect->commit));
+ git_oid_cpy(&h->orig_commit_id, git_commit_id(e->suspect->commit));
h->final_signature = git_signature_dup(git_commit_author(e->suspect->commit));
+ h->orig_signature = git_signature_dup(git_commit_author(e->suspect->commit));
h->boundary = e->is_boundary ? 1 : 0;
return h;
}