git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Todd Zullinger <tmz@pobox.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Matthieu Moy <Matthieu.Moy@univ-lyon1.fr>
Subject: [PATCH] t3701: update tests fixed with builtin add -p
Date: Tue, 14 Jun 2022 14:52:18 -0400	[thread overview]
Message-ID: <20220614185218.1091413-1-tmz@pobox.com> (raw)
In-Reply-To: <xmqqwndk10gg.fsf@gitster.g>

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@pobox.com>
---
 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 &&

  parent reply	other threads:[~2022-06-14 19:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-14  1:46 [ANNOUNCE] Git v2.37.0-rc0 Junio C Hamano
2022-06-14 15:00 ` Derrick Stolee
2022-06-14 18:52 ` Todd Zullinger [this message]
     [not found] ` <0aff4d49e5934d11870a3c6bfecf1af0@SAMBXP02.univ-lyon1.fr>
2022-06-14 21:34   ` [PATCH] t3701: update tests fixed with builtin add -p Matthieu Moy
2022-06-16 14:05 ` [ANNOUNCE] Git v2.37.0-rc0 Matthew John Cheetham
2022-06-16 18:13   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220614185218.1091413-1-tmz@pobox.com \
    --to=tmz@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=Matthieu.Moy@univ-lyon1.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).