From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2] launch_editor: waiting message on error
Date: Tue, 9 Apr 2024 01:09:21 +0200 [thread overview]
Message-ID: <0258a583-a90a-4434-bb4e-a1672d574b9c@gmail.com> (raw)
In-Reply-To: <96bef5f9-1286-4938-99ec-6beed13ee68d@gmail.com>
We have the hint we're touching in this commit since abfb04d0c7
(launch_editor(): indicate that Git waits for user input, 2017-12-07).
Adding a new line after the hint when the editor returns error was
discussed in the list, but finally it was considered not necessary
because a shorter message is used [1].
However, even with a short message, feeding that LF makes the following
"error: There was a problem with the..." clearer, separating it from
possible messages that the editor could have printed. So, add that LF.
While we're here, make the error message follow our CodingGuideLines.
[1] https://public-inbox.org/git/20171127134716.69471-1-lars.schneider@autodesk.com/T/#u
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
This v2 fixes some whitespaces I didn't notice.
Sorry for the mess.
editor.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/editor.c b/editor.c
index b67b802ddf..8f224747d9 100644
--- a/editor.c
+++ b/editor.c
@@ -104,16 +104,26 @@ static int launch_specified_editor(const char *editor, const char *path,
sigchain_pop(SIGQUIT);
if (sig == SIGINT || sig == SIGQUIT)
raise(sig);
+
+ if (print_waiting_for_editor && !is_terminal_dumb()) {
+ if (!ret)
+ /*
+ * Erase the entire line to avoid wasting
+ * the vertical space.
+ */
+ term_clear_line();
+ else
+ /*
+ * We don't want term_clear_line() here
+ * because the editor could have written
+ * some useful messages to the user.
+ */
+ fprintf(stderr, "\n");
+ }
+
if (ret)
- return error("There was a problem with the editor '%s'.",
+ return error("there was a problem with the editor '%s'",
editor);
-
- if (print_waiting_for_editor && !is_terminal_dumb())
- /*
- * Erase the entire line to avoid wasting the
- * vertical space.
- */
- term_clear_line();
}
if (!buffer)
--
2.44.0.502.g3e6838d230
next prev parent reply other threads:[~2024-04-08 23:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 21:02 [PATCH] launch_editor: waiting message on error Rubén Justo
2024-04-08 21:07 ` Rubén Justo
2024-04-08 23:09 ` Rubén Justo [this message]
2024-04-09 1:27 ` [PATCH v2] " Junio C Hamano
2024-04-09 23:38 ` Rubén Justo
2024-04-10 15:44 ` Junio C Hamano
2024-04-11 23:18 ` Rubén Justo
2024-04-12 15:46 ` Junio C Hamano
2024-04-12 17:03 ` Rubén Justo
2024-04-12 17:35 ` Junio C Hamano
2024-04-12 18:24 ` Rubén Justo
2024-04-12 17:05 ` [PATCH v3 0/2] launch_editor: waiting message Rubén Justo
2024-04-12 17:15 ` [PATCH v3 1/2] launch_editor: waiting for editor message Rubén Justo
2024-04-12 17:24 ` rsbecker
2024-04-12 17:37 ` Rubén Justo
2024-04-12 17:47 ` rsbecker
2024-04-13 15:06 ` Phillip Wood
2024-04-12 17:15 ` [PATCH v3 2/2] launch_editor: waiting message on error Rubén Justo
2024-04-13 15:09 ` Phillip Wood
2024-04-14 7:23 ` Rubén Justo
2024-04-14 7:39 ` [PATCH v4] " Rubén Justo
2024-04-15 14:05 ` Phillip Wood
2024-04-15 17:03 ` Rubén Justo
2024-04-15 17:20 ` Junio C Hamano
2024-04-15 17:07 ` Rubén Justo
2024-04-15 18:44 ` 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=0258a583-a90a-4434-bb4e-a1672d574b9c@gmail.com \
--to=rjusto@gmail.com \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).