From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 1/2] built-in add -i: do not try to `patch`/`diff` an empty list of files
Date: Fri, 17 Jan 2020 11:03:02 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2001171101150.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqzhenf3t0.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Thu, 16 Jan 2020, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > When the user does not select any files to `patch` or `diff`, there is
> > no need to call `run_add_p()` on them.
> >
> > Even worse: we _have_ to avoid calling `parse_pathspec()` with an empty
> > list because that would trigger this error:
> >
> > BUG: pathspec.c:557: PATHSPEC_PREFER_CWD requires arguments
> >
> > So let's avoid doing any work on a list of files that is empty anyway.
> >
> > This fixes https://github.com/git-for-windows/git/issues/2466.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > add-interactive.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Makes sense. No tests?
Do we really need tests here? ;-)
Honestly, I would deem the likelihood of this to get broken again very
low, and the effort for writing a regression test relatively high...
If you insist, I will add some, of course, but not today.
Ciao,
Dscho
>
> >
> > diff --git a/add-interactive.c b/add-interactive.c
> > index f395d54c08..14d4688c26 100644
> > --- a/add-interactive.c
> > +++ b/add-interactive.c
> > @@ -915,7 +915,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
> >
> > opts->prompt = N_("Patch update");
> > count = list_and_choose(s, files, opts);
> > - if (count >= 0) {
> > + if (count > 0) {
> > struct argv_array args = ARGV_ARRAY_INIT;
> >
> > argv_array_pushl(&args, "git", "add--interactive", "--patch",
> > @@ -953,7 +953,7 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
> > opts->flags = IMMEDIATE;
> > count = list_and_choose(s, files, opts);
> > opts->flags = 0;
> > - if (count >= 0) {
> > + if (count > 0) {
> > struct argv_array args = ARGV_ARRAY_INIT;
> >
> > argv_array_pushl(&args, "git", "diff", "-p", "--cached",
>
next prev parent reply other threads:[~2020-01-17 10:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 8:33 [PATCH 0/2] Two fixes for the built-in git add -i Johannes Schindelin via GitGitGadget
2020-01-16 8:33 ` [PATCH 1/2] built-in add -i: do not try to `patch`/`diff` an empty list of files Johannes Schindelin via GitGitGadget
2020-01-16 22:13 ` Junio C Hamano
2020-01-17 10:03 ` Johannes Schindelin [this message]
2020-01-16 8:33 ` [PATCH 2/2] built-in add -i: accept open-ended ranges again Johannes Schindelin via GitGitGadget
2020-01-16 22:16 ` Junio C Hamano
2020-01-17 10:01 ` Johannes Schindelin
2020-01-17 17:35 ` 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
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=nycvar.QRO.7.76.6.2001171101150.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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.
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).