![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Apr 2011 19:41:16 +0000 (12:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Apr 2011 22:26:41 +0000 (15:26 -0700) | ||
| commit | f3217e2b1791580ce6499b800e93989d312f9718 | |
| tree | 90427075ad932ea9d69b5e6c8749c77b83a30405 | tree | snapshot |
| parent | f5ea3f2bb30bf912d0021ef6a77e772ccdb4f8fd | commit | diff |
t3701: Editing a split hunk in an "add -p" session
Arnaud Lacombe reported that with the recent change to reject overlapping
hunks fed to "git apply", the edit mode of an "add -p" session that lazily
feeds overlapping hunks without coalescing adjacent ones claim that the
patch does not apply. Expose the problem to be fixed.
Cf. http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Arnaud Lacombe reported that with the recent change to reject overlapping
hunks fed to "git apply", the edit mode of an "add -p" session that lazily
feeds overlapping hunks without coalescing adjacent ones claim that the
patch does not apply. Expose the problem to be fixed.
Cf. http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3701-add-interactive.sh | diff | blob | history |