From 2cf833743294f27d8f167043c84146455b96bdb7 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Wed, 24 May 2017 00:15:22 -0500 Subject: blame: move show_root flag to scoreboard The show_root flag 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 diff --git a/builtin/blame.c b/builtin/blame.c index 161d15c..fdd41b4 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -384,6 +384,7 @@ struct blame_scoreboard { /* flags */ int reverse; + int show_root; }; static void sanity_check_refcnt(struct blame_scoreboard *); @@ -1784,7 +1785,7 @@ static void assign_blame(struct blame_scoreboard *sb, int opt) mark_parents_uninteresting(commit); } /* treat root commit as boundary */ - if (!commit->parents && !show_root) + if (!commit->parents && !sb->show_root) commit->object.flags |= UNINTERESTING; /* Take responsibility for the remaining entries */ @@ -2885,6 +2886,8 @@ parse_done: if (blame_copy_score) sb.copy_score = blame_copy_score; + sb.show_root = show_root; + read_mailmap(&mailmap, NULL); assign_blame(&sb, opt); -- cgit v0.10.2-6-g49f6