diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-16 10:48:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-16 18:52:12 -0700 |
| commit | 7a26e653929025e11e689bc7d98365c9a0107dc9 (patch) | |
| tree | 8af6eb75c4e31acf04f84cb9ca330539dbeb672e /t | |
| parent | f67182bf65b01290a9544e9599ea8255e657e567 (diff) | |
| download | git-7a26e653929025e11e689bc7d98365c9a0107dc9.tar.gz git-7a26e653929025e11e689bc7d98365c9a0107dc9.tar.xz | |
Revert "git-add--interactive: remove hunk coalescing"
This reverts commit 0beee4c6dec15292415e3d56075c16a76a22af54 but with a
bit of twist, as we have added "edit hunk manually" hack and we cannot
rely on the original line numbers of the hunks that were manually edited.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3701-add-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 9999fcd4b..5cdb83d28 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -189,7 +189,7 @@ index b6f2c08..61b9053 100755 +lastline EOF # Test splitting the first patch, then adding both -test_expect_failure 'add first line works' ' +test_expect_success 'add first line works' ' git commit -am "clear local changes" && git apply patch && (echo s; echo y; echo y) | git add -p file && |