From: Elijah Newren <newren@gmail.com>
To: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
Cc: Philip Oakley <philipoakley@iee.email>,
Git Mailing List <git@vger.kernel.org>,
mailnew4ster@gmail.com
Subject: Re: gitignore + commit with excludes = bug
Date: Mon, 10 May 2021 15:34:20 -0700 [thread overview]
Message-ID: <CABPp-BHPr0aJZTRsVPK+Ga2oKZJLa75OkcyHLpZH=sD1pfpNZg@mail.gmail.com> (raw)
In-Reply-To: <CAHd-oW7veyN+qetv-Mf-qPa+bcah=JCz6mSRAzunVgaFRxdbnA@mail.gmail.com>
On Mon, May 10, 2021 at 12:37 PM Matheus Tavares Bernardino
<matheus.bernardino@usp.br> wrote:
>
> On Mon, May 10, 2021 at 4:27 PM Elijah Newren <newren@gmail.com> wrote:
> >
> > Thanks for tracking this down. Your analysis and patch look correct
> > to me, but perhaps we could simplify the code a bit. Instead of
> > looping twice, perhaps insert the following code above the if-checks:
> >
> > + /*
> > + * We can have a bunch of exclusion rules:
> > + * .gitignore
> > + * *.log
> > + * !settings.log
> > + * and we're trying to see if the path matches one of these,
> > + * but note that the last one is a "negated exclusion rule",
> > + * for the excludes to match this pathspec, it needs to not
> > + * match the negated exclusion.
> > + */
> > + int retval = (item->magic & PATHSPEC_EXCLUDE) ? 0 : 1;
> >
> > and then change all the "return 1" statements to "return retval".
>
> Hmm, but then wouldn't something like `git add ignored :^ignored` also
> trigger the warning, as we see 'ignored' first, and return 1 before
> seeing ':^ignored'?
Oh, right, whoops. Do you want to add this testcase, and a commit
message for this (and maybe a comment explaining the double loop)?
next prev parent reply other threads:[~2021-05-10 22:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-01 18:37 gitignore + commit with excludes = bug Paul Jackson
2021-05-04 12:55 ` Philip Oakley
2021-05-04 14:06 ` Matheus Tavares
2021-05-09 6:21 ` Paul Jackson
2021-05-10 16:20 ` Philip Oakley
2021-05-10 19:27 ` Elijah Newren
2021-05-10 19:37 ` Matheus Tavares Bernardino
2021-05-10 22:34 ` Elijah Newren [this message]
2021-05-11 2:23 ` Matheus Tavares Bernardino
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='CABPp-BHPr0aJZTRsVPK+Ga2oKZJLa75OkcyHLpZH=sD1pfpNZg@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=mailnew4ster@gmail.com \
--cc=matheus.bernardino@usp.br \
--cc=philipoakley@iee.email \
/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).