diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:13 -0700 |
commit | 0f8472a4973d8ded25ece3a7efb25afa8719a393 (patch) | |
tree | cb287667f167eeeeb8975420a8452f162062161c | |
parent | Merge branch 'hv/t5526-andand-chain-fix' (diff) | |
parent | diff: retire sane_truncate_fn (diff) | |
download | tgif-0f8472a4973d8ded25ece3a7efb25afa8719a393.tar.xz |
Merge branch 'jc/diff-sane-truncate-no-more'
Code clean-up.
* jc/diff-sane-truncate-no-more:
diff: retire sane_truncate_fn
-rw-r--r-- | diff.c | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -406,8 +406,6 @@ static struct diff_tempfile { struct tempfile tempfile; } diff_temp[2]; -typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len); - struct emit_callback { int color_diff; unsigned ws_rule; @@ -415,7 +413,6 @@ struct emit_callback { int blank_at_eof_in_postimage; int lno_in_preimage; int lno_in_postimage; - sane_truncate_fn truncate; const char **label_path; struct diff_words_data *diff_words; struct diff_options *opt; @@ -1243,8 +1240,6 @@ static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, u unsigned long allot; size_t l = len; - if (ecb->truncate) - return ecb->truncate(line, len); cp = line; allot = l; while (0 < l) { |