undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame: move contents_from to scoreboard

Browse Source 
The argument from --contents is used in parts of blame that are being
moved to libgit, and should be accessible via the scoreboard structure.

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Smith 2017-05-24 00:15:20 -05:00 committed by Junio C Hamano
parent 18ec0d62ee
commit 84be875e61
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/blame.c
View File

@ -378,6 +378,9 @@ struct blame_scoreboard {
*/ */
unsigned move_score; unsigned move_score;
unsigned copy_score; unsigned copy_score;
/* use this file's contents as the final image */
const char *contents_from;
}; };
static void sanity_check_refcnt(struct blame_scoreboard *); static void sanity_check_refcnt(struct blame_scoreboard *);
@ -2735,6 +2738,7 @@ parse_done:
sb.copy_score = BLAME_DEFAULT_COPY_SCORE; sb.copy_score = BLAME_DEFAULT_COPY_SCORE;
sb.revs = &revs; sb.revs = &revs;
sb.contents_from = contents_from;
if (!reverse) { if (!reverse) {
final_commit_name = prepare_final(&sb); final_commit_name = prepare_final(&sb);
sb.commits.compare = compare_commits_by_commit_date; sb.commits.compare = compare_commits_by_commit_date;