From: Jeff Smith Date: Sun, 14 May 2017 03:15:03 GMT Subject: [RFC PATCH v2 12/22] blame: move no_whole_file_rename flag to scoreboard Message-ID: <20170514031513.9042-13-whydoubt@gmail.com> In-Reply-To: <20170514031513.9042-1-whydoubt@gmail.com> The no_whole_file_rename 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 --- blame.h | 1 + builtin/blame.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/blame.h b/blame.h index 42a948d..c140f41 100644 --- a/blame.h +++ b/blame.h @@ -133,6 +133,7 @@ struct blame_scoreboard { int reverse; int show_root; int xdl_opts; + int no_whole_file_rename; }; #endif /* BLAME_H */ diff --git a/builtin/blame.c b/builtin/blame.c index d3af02b..bd295eb 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1285,7 +1285,7 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin, * The first pass looks for unrenamed path to optimize for * common cases, then we look for renames in the second pass. */ - for (pass = 0; pass < 2 - no_whole_file_rename; pass++) { + for (pass = 0; pass < 2 - sb->no_whole_file_rename; pass++) { struct blame_origin *(*find)(struct commit *, struct blame_origin *); find = pass ? find_rename : find_origin; @@ -2763,6 +2763,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) sb.show_root = show_root; sb.xdl_opts = xdl_opts; + sb.no_whole_file_rename = no_whole_file_rename; read_mailmap(&mailmap, NULL); -- 2.9.3