[PATCH] devtools: move mailmap check after patch applied

[PATCH] devtools: move mailmap check after patch applied

[Thomas Monjalon]

The names in a patch were possibly checked with checkpatches.sh
before applying the patch, so before .mailmap file was updated.

The check is moved and translated in check-git-log.sh,
which is run only on a repository, not a detached patch file.

Fixes: e83d41f0694d ("mailmap: add list of contributors")
Cc: stable@dpdk.org

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/check-git-log.sh | 15 +++++++++++++++
 devtools/checkpatches.sh  | 30 ------------------------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index e26205814b..af751e49ab 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -259,6 +259,21 @@ done)
 [ -z "$bad" ] || { printf "Missing 'Signed-off-by:' tag: \n$bad\n"\
 	&& failure=true;}
 
+# check names
+names=$(git log --format='From: %an <%ae>%n%b' --reverse $range |
+	sed -rn 's,.*: (.*<.*@.*>),\1,p' |
+	sort -u)
+bad=$(for contributor in $names ; do
+	! grep -qE "^$contributor($| <)" $selfdir/../.mailmap || continue
+	if grep -q "^${contributor%% <*} <" .mailmap ; then
+		printf "\t$contributor is not the primary email address\n"
+	else
+		printf "\t$contributor is unknown in .mailmap\n"
+	fi
+done)
+[ -z "$bad" ] || { printf "Contributor name/email mismatch with .mailmap: \n$bad\n"\
+	&& failure=true;}
+
 total=$(echo "$commits" | wc -l)
 if $failure ; then
 	printf "\nInvalid patch(es) found - checked $total patch"
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 1dee094c7a..a07bbc83cb 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -248,28 +248,6 @@ check_release_notes() { # <patch>
 		grep -v $current_rel_notes
 }
 
-check_names() { # <patch>
-	res=0
-
-	old_IFS=$IFS
-	IFS='
-'
-	for contributor in $(sed -rn '/^$/,/^--- / {s/.*: (.*<.*@.*>)/\1/p}' $1); do
-		! grep -qE "^$contributor($| <)" .mailmap || continue
-		name=${contributor%% <*}
-		if grep -q "^$name <" .mailmap; then
-			reason="$name mail differs from primary mail"
-		else
-			reason="$contributor is unknown"
-		fi
-		echo "$reason, please fix the commit message or update .mailmap."
-		res=1
-	done
-	IFS=$old_IFS
-
-	return $res
-}
-
 number=0
 range='origin/main..'
 quiet=false
@@ -378,14 +356,6 @@ check () { # <patch-file> <commit>
 		ret=1
 	fi
 
-	! $verbose || printf '\nChecking names in commit log:\n'
-	report=$(check_names "$tmpinput")
-	if [ $? -ne 0 ] ; then
-		$headline_printed || print_headline "$subject"
-		printf '%s\n' "$report"
-		ret=1
-	fi
-
 	if [ "$tmpinput" != "$1" ]; then
 		rm -f "$tmpinput"
 		trap - INT
-- 
2.39.1

Re: [PATCH] devtools: move mailmap check after patch applied

[David Marchand]

On Mon, Mar 27, 2023 at 4:52 PM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The names in a patch were possibly checked with checkpatches.sh
> before applying the patch, so before .mailmap file was updated.
>
> The check is moved and translated in check-git-log.sh,
> which is run only on a repository, not a detached patch file.
>
> Fixes: e83d41f0694d ("mailmap: add list of contributors")
> Cc: stable@dpdk.org
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

I don't really like how we rely on the IFS= change in the middle of
check-git-log.sh, but this change works.

Reviewed-by: David Marchand <david.marchand@redhat.com>


-- 
David Marchand

Re: [PATCH] devtools: move mailmap check after patch applied

[Ferruh Yigit]

On 3/28/2023 2:52 PM, David Marchand wrote:
> On Mon, Mar 27, 2023 at 4:52 PM Thomas Monjalon <thomas@monjalon.net> wrote:
>>
>> The names in a patch were possibly checked with checkpatches.sh
>> before applying the patch, so before .mailmap file was updated.
>>
>> The check is moved and translated in check-git-log.sh,
>> which is run only on a repository, not a detached patch file.
>>
>> Fixes: e83d41f0694d ("mailmap: add list of contributors")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> 
> I don't really like how we rely on the IFS= change in the middle of
> check-git-log.sh, but this change works.
> 
> Reviewed-by: David Marchand <david.marchand@redhat.com>
> 
> 

Tested-by: Ferruh Yigit <ferruh.yigit@amd.com>

Re: [PATCH] devtools: move mailmap check after patch applied

[Thomas Monjalon]

28/03/2023 16:27, Ferruh Yigit:
> On 3/28/2023 2:52 PM, David Marchand wrote:
> > On Mon, Mar 27, 2023 at 4:52 PM Thomas Monjalon <thomas@monjalon.net> wrote:
> >>
> >> The names in a patch were possibly checked with checkpatches.sh
> >> before applying the patch, so before .mailmap file was updated.
> >>
> >> The check is moved and translated in check-git-log.sh,
> >> which is run only on a repository, not a detached patch file.
> >>
> >> Fixes: e83d41f0694d ("mailmap: add list of contributors")
> >> Cc: stable@dpdk.org
> >>
> >> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > 
> > I don't really like how we rely on the IFS= change in the middle of
> > check-git-log.sh, but this change works.
> > 
> > Reviewed-by: David Marchand <david.marchand@redhat.com>
> 
> Tested-by: Ferruh Yigit <ferruh.yigit@amd.com>

Applied