summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-11 14:23:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-11 14:23:47 -0700
commit331fe94fedb40851de29f0954026c705118102b3 (patch)
treebc606370038901227d64785687e523bfcd1cf9c5 /tree-diff.c
parentMerge branch 'tb/t0027-crlf' (diff)
parentstash -p: demonstrate failure of split with mixed y/n (diff)
downloadtgif-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 'tree-diff.c')
0 files changed, 0 insertions, 0 deletions