Re: [PATCH 09/18] fsck: handle multiple authors in commits specially
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Dec 22, 2014, 21:53 UTC
- Message-ID
- <alpine.DEB.1.00.1412222251160.21312@s15462909.onlinehome-server.info>
- In-Reply-To
- <xmqqk31zidp5.fsf@gitster.dls.corp.google.com>
Hi Junio,
On Wed, 10 Dec 2014, Junio C Hamano wrote:
Show 13 quoted lines
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
> > This problem has been detected in the wild, and is the primary reason
> > to introduce an option to demote certain fsck errors to warnings. Let's
> > offer to ignore this particular problem specifically.
> > ...
> > + while (skip_prefix(buffer, "author ", &buffer)) {
> > + err = report(options, &commit->object, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines");
> > + if (err)
> > + return err;
>
> If we have an option to demote this to a warning, wouldn't we want
> to do the same fsck_ident() on that secondary author line?Good point! I changed the following to use fsck_ident() instead:
Show 6 quoted lines
> > + /* require_end_of_header() ensured that there is a newline */ > > + buffer = strchr(buffer, '\n') + 1; > > + } > > if (!skip_prefix(buffer, "committer ", &buffer)) > > return report(options, &commit->object, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line"); > > err = fsck_ident(&buffer, &commit->object, options);
Ciao, Dscho