path: root/blame.h
diff options
authorJunio C Hamano <>2019-07-19 18:30:20 (GMT)
committerJunio C Hamano <>2019-07-19 18:30:20 (GMT)
commit209f0755934a0c9b448408f9b7c9849c15041ecc (patch)
treeea04d9cd2847c3753c778b4dc5b976f37b19c910 /blame.h
parentc62bff2cedead7df6fc55a745f073715da30727e (diff)
parent78fafbb2800915047ad2f1578c34ca19c316eca2 (diff)
Merge branch 'br/blame-ignore'
"git blame" learned to "ignore" commits in the history, whose effects (as well as their presence) get ignored. * br/blame-ignore: t8014: remove unnecessary braces blame: drop some unused function parameters blame: add a test to cover blame_coalesce() blame: use the fingerprint heuristic to match ignored lines blame: add a fingerprint heuristic to match ignored lines blame: optionally track line fingerprints during fill_blame_origin() blame: add config options for the output of ignored or unblamable lines blame: add the ability to ignore commits and their changes blame: use a helper function in blame_chunk() Move oidset_parse_file() to oidset.c fsck: rename and touch up init_skiplist()
Diffstat (limited to 'blame.h')
1 files changed, 6 insertions, 0 deletions
diff --git a/blame.h b/blame.h
index d62f80f..4a9e127 100644
--- a/blame.h
+++ b/blame.h
@@ -51,6 +51,8 @@ struct blame_origin {
struct blame_entry *suspects;
mmfile_t file;
+ int num_lines;
+ void *fingerprints;
struct object_id blob_oid;
unsigned short mode;
/* guilty gets set when shipping any suspects to the final
@@ -92,6 +94,8 @@ struct blame_entry {
* scanning the lines over and over.
unsigned score;
+ int ignored;
+ int unblamable;
@@ -117,6 +121,8 @@ struct blame_scoreboard {
/* linked list of blames */
struct blame_entry *ent;
+ struct oidset ignore_list;
/* look-up a line in the final buffer */
int num_lines;
int *lineno;