diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-04-10 11:27:50 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-10 10:26:31 -0700 |
commit | 08d383f23e80e418c844952fcc4e2e635962c292 (patch) | |
tree | 224078e2c20f9b24a935a4afa0c42799aaa69963 /shell.c | |
parent | Merge branch 'ds/default-pack-use-sparse-to-true' (diff) | |
download | tgif-08d383f23e80e418c844952fcc4e2e635962c292.tar.xz |
interactive: refactor code asking the user for interactive input
There are quite a few code locations (e.g. `git clean --interactive`)
where Git asks the user for an answer. In preparation for fixing a bug
shared by all of them, and also to DRY up the code, let's refactor it.
Please note that most of these callers trimmed white-space both at the
beginning and at the end of the answer, instead of trimming only the
end (as the caller in `add-patch.c` does).
Therefore, technically speaking, we change behavior in this patch. At
the same time, it can be argued that this is actually a bug fix.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shell.c')
-rw-r--r-- | shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4,6 +4,7 @@ #include "strbuf.h" #include "run-command.h" #include "alias.h" +#include "prompt.h" #define COMMAND_DIR "git-shell-commands" #define HELP_COMMAND COMMAND_DIR "/help" @@ -76,12 +77,11 @@ static void run_shell(void) int count; fprintf(stderr, "git> "); - if (strbuf_getline_lf(&line, stdin) == EOF) { + if (git_read_line_interactively(&line) == EOF) { fprintf(stderr, "\n"); strbuf_release(&line); break; } - strbuf_trim(&line); rawargs = strbuf_detach(&line, NULL); split_args = xstrdup(rawargs); count = split_cmdline(split_args, &argv); |