From 84be875e610d7f10f2bfe9646d4ea1ace043c486 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Wed, 24 May 2017 00:15:20 -0500 Subject: [PATCH] blame: move contents_from to scoreboard 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 Signed-off-by: Junio C Hamano --- builtin/blame.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builtin/blame.c b/builtin/blame.c index 643f847efe..0955fc125c 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -378,6 +378,9 @@ struct blame_scoreboard { */ unsigned move_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 *); @@ -2735,6 +2738,7 @@ parse_done: sb.copy_score = BLAME_DEFAULT_COPY_SCORE; sb.revs = &revs; + sb.contents_from = contents_from; if (!reverse) { final_commit_name = prepare_final(&sb); sb.commits.compare = compare_commits_by_commit_date;