From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Fernando Ramos <greenfoo@u92.eu>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 3/7] mergetools: vimdiff: silence annoying messages
Date: Mon, 8 Aug 2022 19:45:45 -0500 [thread overview]
Message-ID: <20220809004549.123020-4-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20220809004549.123020-1-felipe.contreras@gmail.com>
When using the single window mode we are greeted with the following
warning:
"./content_LOCAL_8975" 6L, 28B
"./content_BASE_8975" 6 lines, 29 bytes
"./content_REMOTE_8975" 6 lines, 29 bytes
"content" 16 lines, 115 bytes
Press ENTER or type command to continue
every time.
Silence that.
Suggested-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
mergetools/vimdiff | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 95d637b997..06a7b38841 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -343,7 +343,7 @@ gen_cmd () {
then
CMD="$CMD | tabdo windo diffthis"
else
- CMD="$CMD | bufdo diffthis"
+ CMD="$CMD | silent bufdo diffthis"
fi
@@ -558,7 +558,7 @@ run_unit_tests () {
EXPECTED_CMD_01="-c \"set hidden | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabdo windo diffthis\" -c \"tabfirst\""
EXPECTED_CMD_02="-c \"set hidden | echo | leftabove vertical split | 1b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
EXPECTED_CMD_03="-c \"set hidden | echo | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 4b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
- EXPECTED_CMD_04="-c \"set hidden | echo | 4b | bufdo diffthis\" -c \"tabfirst\""
+ EXPECTED_CMD_04="-c \"set hidden | echo | 4b | silent bufdo diffthis\" -c \"tabfirst\""
EXPECTED_CMD_05="-c \"set hidden | echo | leftabove split | 1b | wincmd j | leftabove split | 4b | wincmd j | 3b | tabdo windo diffthis\" -c \"tabfirst\""
EXPECTED_CMD_06="-c \"set hidden | echo | leftabove vertical split | leftabove split | 1b | wincmd j | 3b | wincmd l | 4b | tabdo windo diffthis\" -c \"tabfirst\""
EXPECTED_CMD_07="-c \"set hidden | echo | leftabove vertical split | 4b | wincmd l | leftabove split | 1b | wincmd j | 3b | tabdo windo diffthis\" -c \"tabfirst\""
--
2.37.1
next prev parent reply other threads:[~2022-08-09 0:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-09 0:45 [PATCH v3 0/7] mergetools: vimdiff: regression fixes and improvements Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 1/7] mergetools: vimdiff: fix comment Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 2/7] mergetools: vimdiff: make vimdiff3 actually work Felipe Contreras
2022-08-09 0:45 ` Felipe Contreras [this message]
2022-08-09 0:45 ` [PATCH v3 4/7] mergetools: vimdiff: fix for diffopt Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 5/7] mergetools: vimdiff: fix single window layouts Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 6/7] mergetools: vimdiff: rework tab logic Felipe Contreras
2022-08-09 0:45 ` [PATCH v3 7/7] mergetools: vimdiff: restore selective diff mode Felipe Contreras
2022-08-09 1:08 ` Felipe Contreras
2022-08-09 5:26 ` Fernando Ramos
2022-08-09 20:07 ` Felipe Contreras
2022-08-10 8:45 ` Junio C Hamano
2022-08-10 18:29 ` 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
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=20220809004549.123020-4-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=greenfoo@u92.eu \
/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).