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 <whydoubt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff Smith committed
May 24, 2017 at 00:15 UTC
84be875e610d7f10f2bfe9646d4ea1ace043c486
1 file changed
+4
builtin/blame.c
+4
@@ -378,6 +378,9 @@ struct blame_scoreboard {
378
*/
379
unsigned move_score;
380
unsigned copy_score;
381
+
382
+ /* use this file's contents as the final image */
383
+ const char *contents_from;
384
};
385
386
static void sanity_check_refcnt(struct blame_scoreboard *);
@@ -2735,6 +2738,7 @@ parse_done:
2738
sb.copy_score = BLAME_DEFAULT_COPY_SCORE;
2739
2740
sb.revs = &revs;
2741
+ sb.contents_from = contents_from;
2742
if (!reverse) {
2743
final_commit_name = prepare_final(&sb);
2744
sb.commits.compare = compare_commits_by_commit_date;