From ac618c418e5e16acd82dc3d8e4356a39150de5a2 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Tue, 22 Feb 2022 18:53:35 +0000 Subject: add -p: disable stdin buffering when interactive.singlekey is set The builtin "add -p" reads the key "F2" as three separate keys "^[", "O" and "Q". The "Q" causes it to quit which is probably not what the user was expecting. This is because it uses poll() to check for pending input when reading escape sequences but reads the input with getchar() which is buffered by default and so hoovers up all the pending input leading poll() think there isn't anything pending. Fix this by calling setbuf() to disable input buffering if interactive.singlekey is set. Looking at the comment above mingw_getchar() in terminal.c I wonder if that function is papering over this bug and could be removed. Unfortunately I don't have access to windows to test that. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- add-interactive.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'add-interactive.c') diff --git a/add-interactive.c b/add-interactive.c index 6498ae196f..ad78774ca2 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -70,6 +70,8 @@ void init_add_i_state(struct add_i_state *s, struct repository *r) &s->interactive_diff_algorithm); git_config_get_bool("interactive.singlekey", &s->use_single_key); + if (s->use_single_key) + setbuf(stdin, NULL); } void clear_add_i_state(struct add_i_state *s) -- cgit v1.2.3