commit 5b162879e93dab3b4bcd66afdbea3a96660abd7d
author Michael Haggerty <mhagger@alum.mit.edu> Mon Sep 05 11:44:53 2016 +0200
committer Junio C Hamano <gitster@pobox.com> Mon Sep 19 10:25:11 2016 -0700
tree 409c0b32b3ff0ae9be653d723900fc61c8eb909c
parent ce564eb1bd541a87152e3546fb7d7a2b460df7ed

blame: honor the diff heuristic options and config

Teach "git blame" and "git annotate" the --compaction-heuristic and
--indent-heuristic options that are now supported by "git diff".

Also teach them to honor the `diff.compactionHeuristic` and
`diff.indentHeuristic` configuration options.

It would be conceivable to introduce separate configuration options for
"blame" and "annotate"; for example `blame.compactionHeuristic` and
`blame.indentHeuristic`. But it would be confusing to users if blame
output is inconsistent with diff output, so it makes more sense for them
to respect the same configuration.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff.h

diff --git a/diff.h b/diff.h
index 125447b..ab55a99 100644
--- a/diff.h
+++ b/diff.h
@@ -266,6 +266,7 @@
 			 const char **optarg);
 
 extern int git_diff_basic_config(const char *var, const char *value, void *cb);
+extern int git_diff_heuristic_config(const char *var, const char *value, void *cb);
 extern void init_diff_ui_defaults(void);
 extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 extern void diff_setup(struct diff_options *);