diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:47 -0700 |
commit | 331fe94fedb40851de29f0954026c705118102b3 (patch) | |
tree | bc606370038901227d64785687e523bfcd1cf9c5 /t/t3304-notes-mixed.sh | |
parent | Merge branch 'tb/t0027-crlf' (diff) | |
parent | stash -p: demonstrate failure of split with mixed y/n (diff) | |
download | tgif-331fe94fedb40851de29f0954026c705118102b3.tar.xz |
Merge branch 'mm/add-p-split-error'
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
Diffstat (limited to 't/t3304-notes-mixed.sh')
0 files changed, 0 insertions, 0 deletions