From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Sam Kuper <sam.kuper@uclmail.net>,
git@vger.kernel.org
Subject: [PATCH 1/2] t3701: add a test for interactive.diffFilter
Date: Sat, 3 Mar 2018 00:58:10 -0500 [thread overview]
Message-ID: <20180303055809.GA15952@sigill.intra.peff.net> (raw)
In-Reply-To: <20180303055715.GH27689@sigill.intra.peff.net>
This feature was added in 01143847db (add--interactive:
allow custom diff highlighting programs, 2016-02-27) but
never tested. Let's add a basic test.
Note that we only apply the filter when color is enabled,
so we have to use test_terminal. This is an open limitation
explicitly mentioned in the original commit. So take this
commit as testing the status quo, and not making a statement
on whether we'd want to enhance that in the future.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t3701-add-interactive.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 058698df6a..64fe56c3d5 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -392,6 +392,18 @@ test_expect_success TTY 'diffs can be colorized' '
grep "$(printf "\\033")" output
'
+test_expect_success TTY 'diffFilter filters diff' '
+ git reset --hard &&
+
+ echo content >test &&
+ test_config interactive.diffFilter "sed s/^/foo:/" &&
+ printf y | test_terminal git add -p >output 2>&1 &&
+
+ # avoid depending on the exact coloring or content of the prompts,
+ # and just make sure we saw our diff prefixed
+ grep foo:.*content output
+'
+
test_expect_success 'patch-mode via -i prompts for files' '
git reset --hard &&
--
2.16.2.708.g0b2ed7f536
next prev parent reply other threads:[~2018-03-03 5:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 1:19 Bug report: "Use of uninitialized value $_ in print" Sam Kuper
2018-03-02 7:04 ` Jonathan Nieder
2018-03-02 10:46 ` Jeff King
2018-03-02 16:53 ` Junio C Hamano
2018-03-02 16:55 ` Jeff King
2018-03-02 17:15 ` Junio C Hamano
2018-03-03 5:57 ` Jeff King
2018-03-03 5:58 ` Jeff King [this message]
2018-03-03 5:58 ` [PATCH 2/2] add--interactive: detect bogus diffFilter output Jeff King
2018-03-05 20:53 ` Junio C Hamano
2018-03-05 20:56 ` Jeff King
2018-03-05 21:33 ` Ævar Arnfjörð Bjarmason
2018-03-05 22:09 ` Junio C Hamano
2018-03-05 22:15 ` Ævar Arnfjörð Bjarmason
2018-03-05 21:54 ` Bug report: "Use of uninitialized value $_ in print" Jonathan Nieder
2018-03-02 17:28 ` Sam Kuper
2018-03-02 10:42 ` Jeff King
2018-03-02 17:30 ` Sam Kuper
2018-03-03 6:02 ` Jeff King
2018-03-02 17:48 ` Junio C Hamano
2018-03-02 20:34 ` Sam Kuper
2018-03-02 21:53 ` Junio C Hamano
2018-03-03 6:18 ` Jeff King
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=20180303055809.GA15952@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sam.kuper@uclmail.net \
/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).