From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Slavica Đukić" <slawica92@hotmail.com>,
"Denton Liu" <liu.denton@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: [PATCH] fixup! add -i: default to the built-in implementation
Date: Wed, 08 Dec 2021 20:12:37 -0800 [thread overview]
Message-ID: <xmqqwnketo0a.fsf@gitster.g> (raw)
In-Reply-To: 84824918ae4564a9194a1a55124ee8694f210437.1638281655.git.gitgitgadget@gmail.com
With the reimplementated "git add -i", two test pieces that used to
expect failure now succeed. Mark them as such.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* Yes, I know this is on hold until some issues in the "add -i"
reimplementation on MacOS are resolved, but as I am getting tired
of seeing "TODO PASSED" when I rebuild and test 'seen', I'll
queue this band-aid at the tip of this topic.
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 207714655f..1effc3f419 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -500,7 +500,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)
@@ -524,7 +524,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 &&
--
2.34.1-373-gb739cc97c5
next prev parent reply other threads:[~2021-12-09 4:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-30 14:14 [PATCH 0/2] Use the built-in implementation of the interactive add command by default Johannes Schindelin via GitGitGadget
2021-11-30 14:14 ` [PATCH 1/2] t2016: require the PERL prereq only when necessary Johannes Schindelin via GitGitGadget
2021-12-01 22:25 ` Junio C Hamano
2021-12-02 14:57 ` Johannes Schindelin
2021-11-30 14:14 ` [PATCH 2/2] add -i: default to the built-in implementation Johannes Schindelin via GitGitGadget
2021-12-01 11:20 ` Phillip Wood
2021-12-02 15:01 ` Johannes Schindelin
2021-12-02 16:58 ` Junio C Hamano
2021-12-02 17:43 ` Ramsay Jones
2021-12-10 22:59 ` Johannes Schindelin
2021-12-01 13:37 ` Ævar Arnfjörð Bjarmason
2021-12-01 22:41 ` Junio C Hamano
2021-12-01 22:34 ` Junio C Hamano
2021-12-02 17:30 ` Johannes Schindelin
2021-12-09 4:12 ` Junio C Hamano [this message]
2021-12-10 22:55 ` [PATCH] fixup! " Johannes Schindelin
2021-11-30 20:56 ` [PATCH 0/2] Use the built-in implementation of the interactive add command by default Jeff King
2021-11-30 21:15 ` Junio C Hamano
2021-12-01 13:43 ` Ævar Arnfjörð Bjarmason
2021-12-01 21:24 ` Carlo Arenas
2021-12-02 17:33 ` Johannes Schindelin
2021-12-03 13:58 ` Philippe Blain
2021-12-06 15:59 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwnketo0a.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=liu.denton@gmail.com \
--cc=slawica92@hotmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).