From: Derrick Stolee <stolee@gmail.com>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 1/2] Refactor code asking the user for input interactively
Date: Fri, 10 Apr 2020 08:27:36 -0400 [thread overview]
Message-ID: <cf6bdc4c-bacf-5de0-b0b3-255e66c7bc18@gmail.com> (raw)
In-Reply-To: <9d2ee78a9e414c0b6aacbc9c878ab08eb70703d5.1586518072.git.gitgitgadget@gmail.com>
On 4/10/2020 7:27 AM, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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).
add-patch also only trims the newline! This is still a good change.
> THerefore, technically speaking, we change behavior in this patch. At
Strange capitalization here.
> the same time, it can be argued that this is actually a bug fix.
>
> @@ -1158,9 +1159,8 @@ static int read_single_character(struct add_p_state *s)
> return res;
> }
>
> - if (strbuf_getline(&s->answer, stdin) == EOF)
> + if (git_read_line_interactively(&s->answer) == EOF)
> return EOF;
> - strbuf_trim_trailing_newline(&s->answer);
(Pointing out the trailing newline trim here.)
> +
> +int git_read_line_interactively(struct strbuf *line)
> +{
> + int ret = strbuf_getline_lf(line, stdin);
> +
> + if (ret != EOF)
> + strbuf_trim_trailing_newline(line);
> +
> + return ret;
> +}
This looks good. Do we need a trailing newline or something?
The way the diff ends abruptly after the "}" line made me
think so.
Thanks,
-Stolee
next prev parent reply other threads:[~2020-04-10 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 19:33 [PATCH] clean: explicitly `fflush` stdout Johannes Schindelin via GitGitGadget
2020-04-08 20:14 ` Jeff King
2020-04-08 21:51 ` Junio C Hamano
2020-04-08 22:38 ` Jeff King
2020-04-10 14:03 ` Johannes Schindelin
2020-04-10 11:27 ` [PATCH v2 0/2] Explicitly fflush stdout in git clean Johannes Schindelin via GitGitGadget
2020-04-10 11:27 ` [PATCH v2 1/2] Refactor code asking the user for input interactively Johannes Schindelin via GitGitGadget
2020-04-10 12:27 ` Derrick Stolee [this message]
2020-04-10 14:01 ` Johannes Schindelin
2020-04-10 15:07 ` Jeff King
2020-04-10 17:44 ` Junio C Hamano
2020-04-10 11:27 ` [PATCH v2 2/2] Explicitly `fflush` stdout before expecting interactive input 마누엘 via GitGitGadget
2020-04-10 12:28 ` Derrick Stolee
2020-04-10 18:16 ` [PATCH v3 0/2] Explicitly fflush stdout in git clean Johannes Schindelin via GitGitGadget
2020-04-10 18:16 ` [PATCH v3 1/2] Refactor code asking the user for input interactively Johannes Schindelin via GitGitGadget
2020-04-10 18:16 ` [PATCH v3 2/2] Explicitly `fflush` stdout before expecting interactive input 마누엘 via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf6bdc4c-bacf-5de0-b0b3-255e66c7bc18@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).