From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Mar 2018 19:01:05 +0000 (-0700)
Subject: Merge branch 'jk/add-i-diff-filter'
X-Git-Tag: v2.17.0-rc0~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5e2df04ac9dd731c729c6159d58c2288d794858;p=git

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

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
---

c5e2df04ac9dd731c729c6159d58c2288d794858