From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 21:23:47 +0000 (-0700)
Subject: Merge branch 'mm/add-p-split-error'
X-Git-Tag: v2.5.0-rc0~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=331fe94fedb40851de29f0954026c705118102b3;p=git

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
---

331fe94fedb40851de29f0954026c705118102b3