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>

diff --git a/diff.c b/diff.c
index efba278935486fbaf533b78fe87ddcd0ef547fd5..9aff167be27b4a6749df50b924aa91da0b4e4a60 100644 (file)
--- 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