diff options
| author |  Jeff Smith <whydoubt@gmail.com> | 2017-05-24 00:15:20 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-24 15:41:51 +0900 |
| commit | 84be875e610d7f10f2bfe9646d4ea1ace043c486 (patch) | |
| tree | 633b649c34ba59d99c37bb72928a881496339415 /builtin | |
| parent | blame: move copy/move thresholds to scoreboard (diff) | |
| download | tgif-84be875e610d7f10f2bfe9646d4ea1ace043c486.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |