Re: [RFD/PATCH] add: ignore only ignored files
- From
Jeff King <peff@peff.net>
- Date
- Nov 20, 2014, 18:20 UTC
- Message-ID
- <20141120182012.GD2559@peff.net>
- In-Reply-To
- <xmqqegsx4whi.fsf@gitster.dls.corp.google.com>
On Thu, Nov 20, 2014 at 09:23:21AM -0800, Junio C Hamano wrote:
Show 24 quoted lines
> > diff --git a/builtin/add.c b/builtin/add.c
> > index ae6d3e2..1074e32 100644
> > --- a/builtin/add.c
> > +++ b/builtin/add.c
> > @@ -284,7 +284,7 @@ static int add_files(struct dir_struct *dir, int flags)
> > for (i = 0; i < dir->ignored_nr; i++)
> > fprintf(stderr, "%s\n", dir->ignored[i]->name);
> > fprintf(stderr, _("Use -f if you really want to add them.\n"));
> > - die(_("no files added"));
> > + exit_status = 1;
> > }
> >
> > for (i = 0; i < dir->nr; i++)
> >
> > It needs a tweak to t3700.35, which expects the "fatal:" line on stderr.
> > But other than that, it passes all tests. So it must be good, right? :)
>
> ;-)
>
> It indeed is a behaviour change, but I do not expect it would be too
> heavy a change to require us a transition period or major version
> bump. But because that is just my expectation, which is not what
> real world users would expect, so I'd prefer to cook such a change
> for at least a cycle and a half in 'next'.Oh, definitely. Showing the patch at all was my not-so-subtle attempt to convince Michael to take over the topic so I did not have to worry about such things. :)
-Peff