diff options
| author | Jeff Smith <whydoubt@gmail.com> | 2017-05-24 05:15:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-24 06:41:51 (GMT) |
| commit | 4149c1860b10512cf32410c1f71311a23dc97f07 (patch) | |
| tree | 18e439487f87f2bf300940c4879f75846b48b6a1 /builtin/blame.c | |
| parent | 1f44129b21235b92d5261964253d965e2249d582 (diff) | |
| download | git-4149c1860b10512cf32410c1f71311a23dc97f07.zip git-4149c1860b10512cf32410c1f71311a23dc97f07.tar.gz git-4149c1860b10512cf32410c1f71311a23dc97f07.tar.bz2 | |
blame: make sanity_check use a callback in scoreboard
Allow the interface user to decide how to handle a failed sanity check,
whether that be to output with the current state or to do nothing.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 90c643c..1b53325 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -387,6 +387,10 @@ struct blame_scoreboard { int show_root; int xdl_opts; int no_whole_file_rename; + int debug; + + /* callbacks */ + void(*on_sanity_fail)(struct blame_scoreboard *, int); }; static void sanity_check_refcnt(struct blame_scoreboard *); @@ -412,7 +416,7 @@ static void blame_coalesce(struct blame_scoreboard *sb) } } - if (DEBUG) /* sanity */ + if (sb->debug) /* sanity */ sanity_check_refcnt(sb); } @@ -1809,7 +1813,7 @@ static void assign_blame(struct blame_scoreboard *sb, int opt) } blame_origin_decref(suspect); - if (DEBUG) /* sanity */ + if (sb->debug) /* sanity */ sanity_check_refcnt(sb); } @@ -2148,12 +2152,16 @@ static void sanity_check_refcnt(struct blame_scoreboard *sb) baa = 1; } } - if (baa) { - int opt = 0160; - find_alignment(sb, &opt); - output(sb, opt); - die("Baa %d!", baa); - } + if (baa) + sb->on_sanity_fail(sb, baa); +} + +static void sanity_check_on_fail(struct blame_scoreboard *sb, int baa) +{ + int opt = OUTPUT_SHOW_SCORE | OUTPUT_SHOW_NUMBER | OUTPUT_SHOW_NAME; + find_alignment(sb, &opt); + output(sb, opt); + die("Baa %d!", baa); } static unsigned parse_score(const char *arg) @@ -2888,6 +2896,9 @@ parse_done: if (blame_copy_score) sb.copy_score = blame_copy_score; + sb.debug = DEBUG; + sb.on_sanity_fail = &sanity_check_on_fail; + sb.show_root = show_root; sb.xdl_opts = xdl_opts; sb.no_whole_file_rename = no_whole_file_rename; |