Running the test suite with 2.37.0-rc0, two tests expected to fail now
pass, thanks to the builtin add -p:
ok 45 - split hunk "add -p (no, yes, edit)" # TODO known breakage vanished
ok 47 - edit, adding lines to the first hunk # TODO known breakage vanished
...
# 2 known breakage(s) vanished; please update test(s)
These tests were added in 1bf01040f0 (add -p: demonstrate failure when
running 'edit' after a split, 2015-04-16) and 0f0fba2cc8 (t3701: add a
test for advanced split-hunk editing, 2019-12-06). In the latter
commit, Johannes said:
Note that just like the preceding test case, the new test case is *not*
handled gracefully by the current `git add -p`. It will be handled
correctly by the upcoming built-in `git add -p`, though.
And it is. :)
Signed-off-by: Todd Zullinger <tmz@xxxxxxxxx>
---
t/t3701-add-interactive.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 94537a6b40..9a06638704 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -538,7 +538,7 @@ test_expect_success 'split hunk "add -p (edit)"' '
! grep "^+15" actual
'
-test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
+test_expect_success 'split hunk "add -p (no, yes, edit)"' '
test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
git reset &&
# test sequence is s(plit), n(o), y(es), e(dit)
@@ -562,7 +562,7 @@ test_expect_success 'split hunk with incomplete line at end' '
test_must_fail git grep --cached before
'
-test_expect_failure 'edit, adding lines to the first hunk' '
+test_expect_success 'edit, adding lines to the first hunk' '
test_write_lines 10 11 20 30 40 50 51 60 >test &&
git reset &&
tr _ " " >patch <<-EOF &&
