On Tue, 19 Sep 2017, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote: > It seems Patchwork or SMTP servers are messing some patches > and changing the original git's author name on git per "Last, First". > So we end up with a mismatch were signed-off uses one name format > and author is using another format. > > So, let's check for email addresses instead. > > However let's continue to WARN so commiters can take action on it > before pushing patch upstream with incorrect "Last, First" name. > > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > --- > dim | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/dim b/dim > index dbaeb1ec944d..13cc5f00209d 100755 > --- a/dim > +++ b/dim > @@ -690,11 +690,16 @@ function checkpatch_commit_push > > # use real names for people with many different email addresses > author=$(git show -s $sha1 --format="format:%an") > + author_email=$(git show -s $sha1 --format="format:%ae") > committer=$(git show -s $sha1 --format="format:%cn") > > # check for author sign-off > if ! git show -s $sha1 | grep -qi "S.*-by:.*$author" ; then > - warn_or_fail "$sha1 is lacking author of sign-off" > + if git show -s $sha1 | grep -qi "S.*-by:.*$author_email" ; then No spaces required before ;. Even if it's copy-pasted from above... ;) > + echoerr "WARNING: Author name mismatch. Patchwork or SMTP messing it up. Consider fixing it before pushing it." Please don't make any assumptions about what caused it. The user may have configured it so. But the real trouble is, it's too late anyway at this state. If this succeeds, it'll already be pushed after it's done! > + else > + warn_or_fail "$sha1 is lacking author of sign-off" Please fix this while at it, it doesn't make any sense. "$sha1 author sign-off missing" or something. > + fi > fi > > # check for committer sign-off -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
