| commit | c5e2df04ac9dd731c729c6159d58c2288d794858 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Mar 2018 19:01:05 +0000 (14 12:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Mar 2018 19:01:05 +0000 (14 12:01 -0700) | ||
| tree | b6db0972487a8a00694e6477deeea245888c6bf7 | treesnapshot (tar.gz zip) |
| parent | bd0f794342d5b3921f2d5d4bffce87ec7b7e4d96 | commitdiff |
| parent | 42f7d45428e260acf535ba0d55ecc91ee81e21da | commitdiff |
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
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
| git-add--interactive.perl | diff1 | diff2 | blobhistory |
| t/t3701-add-interactive.sh | diff1 | diff2 | blobhistory |