summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Smith <whydoubt@gmail.com>2017-05-24 05:15:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-24 06:41:51 (GMT)
commit84be875e610d7f10f2bfe9646d4ea1ace043c486 (patch)
tree633b649c34ba59d99c37bb72928a881496339415
parent18ec0d62ee9819adde8afdc0fb33d37766109b02 (diff)
downloadgit-84be875e610d7f10f2bfe9646d4ea1ace043c486.zip
git-84be875e610d7f10f2bfe9646d4ea1ace043c486.tar.gz
git-84be875e610d7f10f2bfe9646d4ea1ace043c486.tar.bz2
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>
-rw-r--r--builtin/blame.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 643f847..0955fc1 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;