| commit | c556011860fd5b98e52e54330f0e3097201a52bd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 May 2015 04:14:34 +0000 (5 21:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 May 2015 04:14:35 +0000 (5 21:14 -0700) | ||
| tree | a39c9b8b7531e2f3987de1dc721727547d788ca6 | treesnapshot (tar.gz zip) |
| parent | 92596d4e2bd00fdd67515a1f75549847277bc049 | commitdiff |
| parent | 7e9e048661477ad17f57a7153eaaec490660e767 | commitdiff |
Merge branch 'mm/add-p-split-error' into next
When "add--interactive" splits a hunk into two overlapping hunks
and then let the user choose only one, it sometimes feeds an
incorrect patch text to "git apply". Add tests to demonstrate
this.
I have a slight suspicion that this may be $gmane/87202 coming back
and biting us (I seem to have said "let's run with this and see
what happens" back then).
* mm/add-p-split-error:
stash -p: demonstrate failure of split with mixed y/n
t3904-stash-patch: factor PERL prereq at the top of the file
t3904-stash-patch: fix test description
add -p: demonstrate failure when running 'edit' after a split
t3701-add-interactive: simplify code
When "add--interactive" splits a hunk into two overlapping hunks
and then let the user choose only one, it sometimes feeds an
incorrect patch text to "git apply". Add tests to demonstrate
this.
I have a slight suspicion that this may be $gmane/87202 coming back
and biting us (I seem to have said "let's run with this and see
what happens" back then).
* mm/add-p-split-error:
stash -p: demonstrate failure of split with mixed y/n
t3904-stash-patch: factor PERL prereq at the top of the file
t3904-stash-patch: fix test description
add -p: demonstrate failure when running 'edit' after a split
t3701-add-interactive: simplify code