diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-14 12:01:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 12:01:05 -0700 |
| commit | c5e2df04ac9dd731c729c6159d58c2288d794858 (patch) | |
| tree | b6db0972487a8a00694e6477deeea245888c6bf7 /xdiff | |
| parent | Merge branch 'nd/worktree-move' (diff) | |
| parent | add--interactive: detect bogus diffFilter output (diff) | |
| download | tgif-c5e2df04ac9dd731c729c6159d58c2288d794858.tar.xz | |
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
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions