git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] checkout-index: omit entries with no tempname from --temp output
Date: Tue, 9 Feb 2021 18:57:09 -0300	[thread overview]
Message-ID: <CAHd-oW4ddei-bRZkQUSpMevyZYgOBi2T6uQPzJ_XscTmfxhWtw@mail.gmail.com> (raw)
In-Reply-To: <xmqqmtwczzyv.fsf@gitster.c.googlers.com>

On Tue, Feb 9, 2021 at 6:35 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Matheus Tavares <matheus.bernardino@usp.br> writes:
>
> >       if (CHECKOUT_ALL == checkout_stage) {
> > -             for (i = 1; i < 4; i++) {
> > -                     if (i > 1)
> > -                             putchar(' ');
> > -                     if (topath[i][0])
> > -                             fputs(topath[i], stdout);
> > -                     else
> > -                             putchar('.');
> > +             for (i = 1; i < 4; i++)
> > +                     if (topath[i][0]) {
> > +                             have_tempname = 1;
> > +                             break;
> > +                     }
> > +
> > +             if (have_tempname) {
> > +                     for (i = 1; i < 4; i++) {
> > +                             if (i > 1)
> > +                                     putchar(' ');
> > +                             if (topath[i][0])
> > +                                     fputs(topath[i], stdout);
> > +                             else
> > +                                     putchar('.');
> > +                     }
> >               }
> > -     } else
> > +     } else if (topath[checkout_stage][0]) {
> > +             have_tempname = 1;
> >               fputs(topath[checkout_stage], stdout);
> > +     }
> >
> > -     putchar('\t');
> > -     write_name_quoted_relative(name, prefix, stdout,
> > -                                nul_term_line ? '\0' : '\n');
> > +     if (have_tempname) {
> > +             putchar('\t');
> > +             write_name_quoted_relative(name, prefix, stdout,
> > +                                        nul_term_line ? '\0' : '\n');
> >
> > -     for (i = 0; i < 4; i++) {
> > -             topath[i][0] = 0;
> > +             for (i = 0; i < 4; i++) {
> > +                     topath[i][0] = 0;
> > +             }
> >       }
>
> Hmph, is topath[][] array used after this function gets called and
> in what way?  Whether have_tempname is true or not, wouldn't we want
> to clear it?

Yeah, topath[][] can be reused in the next checkout_entry() call. But
if have_tempname is false, the positions that are going to be used
again (either checkout_stage or 1, 2, and 3, if checkout_stage ==
CHECKOUT_ALL) will be already empty. So I think we only need to clear
topath[][] when have_tempname is false.

  reply	other threads:[~2021-02-09 23:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-08 19:36 [PATCH 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-08 19:36 ` [PATCH 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-09 21:27   ` Junio C Hamano
2021-02-09 23:59     ` Matheus Tavares Bernardino
2021-02-08 19:36 ` [PATCH 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
2021-02-09 21:35   ` Junio C Hamano
2021-02-09 21:57     ` Matheus Tavares Bernardino [this message]
2021-02-10  1:07       ` Junio C Hamano
2021-02-15 18:24 ` [PATCH v2 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-15 18:24   ` [PATCH v2 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-16  2:26     ` Junio C Hamano
2021-02-15 18:24   ` [PATCH v2 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
2021-02-16 14:06   ` [PATCH v3 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-16 14:06     ` [PATCH v3 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-16 14:06     ` [PATCH v3 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares

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=CAHd-oW4ddei-bRZkQUSpMevyZYgOBi2T6uQPzJ_XscTmfxhWtw@mail.gmail.com \
    --to=matheus.bernardino@usp.br \
    --cc=git@vger.kernel.org \
    --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).