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
@@ -864,23 +864,17 @@ static int compute_ws_delta(const struct emitted_diff_symbol *a,
864
a_width = a->indent_width,
865
b_off = b->indent_off,
866
b_width = b->indent_width;
867
- int delta;
867
868
if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE) {
869
*out = INDENT_BLANKLINE;
870
return 1;
871
}
872
874
- if (a->s == DIFF_SYMBOL_PLUS)
875
- delta = a_width - b_width;
876
- else
877
- delta = b_width - a_width;
878
-
873
if (a_len - a_off != b_len - b_off ||
874
memcmp(a->line + a_off, b->line + b_off, a_len - a_off))
875
return 0;
876
883
- *out = delta;
877
+ *out = a_width - b_width;
878
879
return 1;
880
}
@@ -924,10 +918,7 @@ static int cmp_in_block_with_wsd(const struct diff_options *o,
918
* match those of the current block and that the text of 'l' and 'cur'
919
* after the indentation match.
920
*/
927
- if (cur->es->s == DIFF_SYMBOL_PLUS)
928
- delta = a_width - c_width;
929
- else
930
- delta = c_width - a_width;
921
+ delta = c_width - a_width;
922
923
/*
924
* If the previous lines of this block were all blank then set its