From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 1/2] launch_editor: waiting for editor message
Date: Fri, 12 Apr 2024 19:15:02 +0200 [thread overview]
Message-ID: <83b34572-498b-438c-8437-dfbb837e60ba@gmail.com> (raw)
In-Reply-To: <ccbd77a1-d334-4d8f-8de0-b542c79330fd@gmail.com>
We have a hint shown when we are waiting for user's editor since
abfb04d0c7 (launch_editor(): indicate that Git waits for user input,
2017-12-07).
After showing the hint, we call start_command() which can return with an
error. Then we'll show "unable to start editor...", after having said
"Waiting for your editor...", which may be confusing.
Move the code to show the hint below the start_command().
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
editor.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/editor.c b/editor.c
index b67b802ddf..1da3a26f5d 100644
--- a/editor.c
+++ b/editor.c
@@ -64,9 +64,21 @@ static int launch_specified_editor(const char *editor, const char *path,
if (strcmp(editor, ":")) {
struct strbuf realpath = STRBUF_INIT;
struct child_process p = CHILD_PROCESS_INIT;
- int ret, sig;
- int print_waiting_for_editor = advice_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2);
+ int ret, sig, print_waiting_for_editor;
+ strbuf_realpath(&realpath, path, 1);
+
+ strvec_pushl(&p.args, editor, realpath.buf, NULL);
+ if (env)
+ strvec_pushv(&p.env, (const char **)env);
+ p.use_shell = 1;
+ p.trace2_child_class = "editor";
+ if (start_command(&p) < 0) {
+ strbuf_release(&realpath);
+ return error("unable to start editor '%s'", editor);
+ }
+
+ print_waiting_for_editor = advice_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2);
if (print_waiting_for_editor) {
/*
* A dumb terminal cannot erase the line later on. Add a
@@ -83,18 +95,6 @@ static int launch_specified_editor(const char *editor, const char *path,
fflush(stderr);
}
- strbuf_realpath(&realpath, path, 1);
-
- strvec_pushl(&p.args, editor, realpath.buf, NULL);
- if (env)
- strvec_pushv(&p.env, (const char **)env);
- p.use_shell = 1;
- p.trace2_child_class = "editor";
- if (start_command(&p) < 0) {
- strbuf_release(&realpath);
- return error("unable to start editor '%s'", editor);
- }
-
sigchain_push(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p);
--
2.44.0.771.gbd07cf668b
next prev parent reply other threads:[~2024-04-12 17:15 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 ` [PATCH v2] " Rubén Justo
2024-04-09 1:27 ` 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 ` Rubén Justo [this message]
2024-04-12 17:24 ` [PATCH v3 1/2] launch_editor: waiting for editor message 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=83b34572-498b-438c-8437-dfbb837e60ba@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).