From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Mar 2018 21:34:15 +0000 (-0800)
Subject: Merge branch 'jk/add-i-diff-filter' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6ef737add30f913e70d32ec985e18899d1dc556e

Merge branch 'jk/add-i-diff-filter' into next

The "interactive.diffFilter" used by "git add -i" must retain
one-to-one correspondence between its input and output, but it was
not enforced and caused end-user confusion.  We now at least make
sure the filtered result has the same number of lines as its input
to detect a broken filter.

* jk/add-i-diff-filter:
add--interactive: detect bogus diffFilter output
t3701: add a test for interactive.diffFilter
---

6ef737add30f913e70d32ec985e18899d1dc556e