Skip to content

Commit 059a500

Browse files
committed
blame: accept --need-minimal
Between v1.7.1 and v1.7.2, 582aa00 switched the default "diff" invocation not to use XDF_NEED_MINIMAL, but this breaks "git blame" rather badly. Allow the command line option to ask for an extra careful matching. Signed-off-by: Junio C Hamano <[email protected]>
1 parent b1bcfbe commit 059a500

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

builtin/blame.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,6 +2320,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
23202320
OPT_BIT('s', NULL, &output_option, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR),
23212321
OPT_BIT('e', "show-email", &output_option, "Show author email instead of name (Default: off)", OUTPUT_SHOW_EMAIL),
23222322
OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE),
2323+
OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better match", XDF_NEED_MINIMAL),
23232324
OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from <file> instead of calling git-rev-list"),
23242325
OPT_STRING(0, "contents", &contents_from, "file", "Use <file>'s contents as the final image"),
23252326
{ OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies within and across files", PARSE_OPT_OPTARG, blame_copy_callback },

0 commit comments

Comments
 (0)