proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 06:51:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2033 from xtao/blame_orig_commit

Browse Source 
Add orig_commit.
This commit is contained in:
Ben Straub 2014-01-08 19:43:31 -08:00
commit 426d8456ea
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/blame.c
View File

@ -242,7 +242,7 @@ static int index_blob_lines(git_blame *blame)
git_off_t len = blame->final_buf_size; git_off_t len = blame->final_buf_size;
int num = 0, incomplete = 0, bol = 1; int num = 0, incomplete = 0, bol = 1;
size_t *i; size_t *i;
if (len && buf[len-1] != '\n') if (len && buf[len-1] != '\n')
incomplete++; /* incomplete line at the end */ incomplete++; /* incomplete line at the end */
while (len--) { while (len--) {
@ -263,13 +263,15 @@ static int index_blob_lines(git_blame *blame)
blame->num_lines = num + incomplete; blame->num_lines = num + incomplete;
return blame->num_lines; return blame->num_lines;
} }
static git_blame_hunk* hunk_from_entry(git_blame__entry *e) static git_blame_hunk* hunk_from_entry(git_blame__entry *e)
{ {
git_blame_hunk *h = new_hunk( git_blame_hunk *h = new_hunk(
e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path); 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->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->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; h->boundary = e->is_boundary ? 1 : 0;
return h; return h;
} }

3
tests/blame/blame_helpers.c
View File

@ -48,6 +48,9 @@ void check_blame_hunk_index(git_repository *repo, git_blame *blame, int idx,
actual, expected); actual, expected);
} }
cl_assert_equal_s(actual, expected); cl_assert_equal_s(actual, expected);
cl_assert_equal_i(git_oid_cmp(&hunk->final_commit_id, &hunk->orig_commit_id), 0);
if (strcmp(hunk->orig_path, orig_path)) { if (strcmp(hunk->orig_path, orig_path)) {
hunk_message(idx, hunk, "has mismatched original path (got '%s', expected '%s')\n", hunk_message(idx, hunk, "has mismatched original path (got '%s', expected '%s')\n",
hunk->orig_path, orig_path); hunk->orig_path, orig_path);