path: root/builtin
diff options
authorJunio C Hamano <>2012-04-11 20:08:08 (GMT)
committerJunio C Hamano <>2012-04-11 20:11:55 (GMT)
commit059a500d25162370afef6a7afe8a4e61f40eb2f3 (patch)
tree060163d08c3afbb031b7f9dab54d9e2b7e67b4ea /builtin
parentb1bcfbe34439ff6d1a04d0bddb01eebe4df418a5 (diff)
blame: accept --need-minimal
Between v1.7.1 and v1.7.2, 582aa00bdffb 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 <>
Diffstat (limited to 'builtin')
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 5a67c20..a8d6679 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2320,6 +2320,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
OPT_BIT('s', NULL, &output_option, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR),
OPT_BIT('e', "show-email", &output_option, "Show author email instead of name (Default: off)", OUTPUT_SHOW_EMAIL),
OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE),
+ OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better match", XDF_NEED_MINIMAL),
OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from <file> instead of calling git-rev-list"),
OPT_STRING(0, "contents", &contents_from, "file", "Use <file>'s contents as the final image"),
{ OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies within and across files", PARSE_OPT_OPTARG, blame_copy_callback },