diff: simplify allow-indentation-change delta calculation
Now that we reliably end a block when the sign changes we don't need the whitespace delta calculation to rely on the sign. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Dec 9, 2021 at 10:30 UTC
76e32d619323c89e44ebfcfdb9d44766937b17dc
1 file changed
+2
-11
diff.c
+2
-11
index efba278935..9aff167be2 100644
--- a/diff.c
+++ b/diff.c
@@ -864,23 +864,17 @@ static int compute_ws_delta(const struct emitted_diff_symbol *a,
a_width = a->indent_width,
b_off = b->indent_off,
b_width = b->indent_width;
- int delta;
if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE) {
*out = INDENT_BLANKLINE;
return 1;
}
- if (a->s == DIFF_SYMBOL_PLUS)
- delta = a_width - b_width;
- else
- delta = b_width - a_width;
-
if (a_len - a_off != b_len - b_off ||
memcmp(a->line + a_off, b->line + b_off, a_len - a_off))
return 0;
- *out = delta;
+ *out = a_width - b_width;
return 1;
}
@@ -924,10 +918,7 @@ static int cmp_in_block_with_wsd(const struct diff_options *o,
* match those of the current block and that the text of 'l' and 'cur'
* after the indentation match.
*/
- if (cur->es->s == DIFF_SYMBOL_PLUS)
- delta = a_width - c_width;
- else
- delta = c_width - a_width;
+ delta = c_width - a_width;
/*
* If the previous lines of this block were all blank then set its