undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame: move no_whole_file_rename flag to scoreboard

Browse Source 
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 <whydoubt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Smith 2017-05-24 00:15:24 -05:00 committed by Junio C Hamano
parent 73e1c299e5
commit 1f44129b21
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/blame.c
View File

@ -386,6 +386,7 @@ struct blame_scoreboard {
int reverse; int reverse;
int show_root; int show_root;
int xdl_opts; int xdl_opts;
int no_whole_file_rename;
}; };
static void sanity_check_refcnt(struct blame_scoreboard *); static void sanity_check_refcnt(struct blame_scoreboard *);
@ -1411,7 +1412,7 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin,
* The first pass looks for unrenamed path to optimize for * The first pass looks for unrenamed path to optimize for
* common cases, then we look for renames in the second pass. * 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 *); struct blame_origin *(*find)(struct commit *, struct blame_origin *);
find = pass ? find_rename : find_origin; find = pass ? find_rename : find_origin;
@ -2889,6 +2890,7 @@ parse_done:
sb.show_root = show_root; sb.show_root = show_root;
sb.xdl_opts = xdl_opts; sb.xdl_opts = xdl_opts;
sb.no_whole_file_rename = no_whole_file_rename;
read_mailmap(&mailmap, NULL); read_mailmap(&mailmap, NULL);