git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: [PATCH] add-patch: response to unknown command
Date: Tue, 21 May 2024 02:37:54 +0200	[thread overview]
Message-ID: <1dbe4c61-d75f-45d9-95d2-ac8acae22c56@gmail.com> (raw)

In 26998ed2a2 (add-patch: response to unknown command, 2024-04-29) we
introduced an error message that displays the invalid command entered by
the user.

We process a line received from the user, but we only accept
single-character commands.

To avoid confusion, include in the error message only the first
character received.

Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
 add-patch.c                | 4 ++--
 t/t3701-add-interactive.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/add-patch.c b/add-patch.c
index 2252895c28..d408a85353 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -1692,8 +1692,8 @@ static int patch_update_file(struct add_p_state *s,
 						 "%.*s", (int)(eol - p), p);
 			}
 		} else {
-			err(s, _("Unknown command '%s' (use '?' for help)"),
-			    s->answer.buf);
+			err(s, _("Unknown command '%c' (use '?' for help)"),
+			    s->answer.buf[0]);
 		}
 	}
 
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 28a95a775d..6f5d3085af 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -60,7 +60,7 @@ test_expect_success 'warn about add.interactive.useBuiltin' '
 
 test_expect_success 'unknown command' '
 	test_when_finished "git reset --hard; rm -f command" &&
-	echo W >command &&
+	echo WW >command &&
 	git add -N command &&
 	git diff command >expect &&
 	cat >>expect <<-EOF &&
-- 
2.45.1.217.gdb529f37a6

             reply	other threads:[~2024-05-21  0:37 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-21  0:37 Rubén Justo [this message]
2024-05-21  7:03 ` [PATCH] add-patch: response to unknown command Patrick Steinhardt
2024-05-21 12:59   ` Rubén Justo
2024-05-21 15:52   ` Re* " Junio C Hamano
2024-05-21 22:27     ` Taylor Blau
2024-05-21 23:06       ` Junio C Hamano
2024-05-21 23:20     ` [PATCH v2] add-patch: enforce only one-letter response to prompts Junio C Hamano
2024-05-21 23:36       ` Eric Sunshine
2024-05-22  0:49         ` Junio C Hamano
2024-05-22  6:40       ` Dragan Simic
2024-05-22 16:23         ` Junio C Hamano
2024-05-22 19:03           ` Dragan Simic
2024-05-22 20:41             ` Junio C Hamano
2024-05-22 11:07       ` Patrick Steinhardt
2024-05-22 16:27         ` Junio C Hamano
2024-05-22 17:14       ` [PATCH v3] " Junio C Hamano
2024-05-22 17:38         ` Rubén Justo
2024-05-22 19:27           ` Junio C Hamano
2024-05-22 21:45         ` [PATCH v4] " Junio C Hamano
2024-05-23  5:31           ` Patrick Steinhardt
2024-05-23 15:58             ` 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=1dbe4c61-d75f-45d9-95d2-ac8acae22c56@gmail.com \
    --to=rjusto@gmail.com \
    --cc=git@vger.kernel.org \
    /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 NNTP newsgroup(s).