Skip to content

Commit 84be875

Browse files
whydoubtgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 18ec0d6 commit 84be875

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

builtin/blame.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,9 @@ struct blame_scoreboard {
378378
*/
379379
unsigned move_score;
380380
unsigned copy_score;
381+
382+
/* use this file's contents as the final image */
383+
const char *contents_from;
381384
};
382385

383386
static void sanity_check_refcnt(struct blame_scoreboard *);
@@ -2735,6 +2738,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
27352738
sb.copy_score = BLAME_DEFAULT_COPY_SCORE;
27362739

27372740
sb.revs = &revs;
2741+
sb.contents_from = contents_from;
27382742
if (!reverse) {
27392743
final_commit_name = prepare_final(&sb);
27402744
sb.commits.compare = compare_commits_by_commit_date;

0 commit comments

Comments
 (0)