Skip to contentSkip to conversation

dim: redo the author sob checks

PATCH In review Daniel Vetter 2 participants 6 messages Sep 27, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 dim: redo the author sob checks

This reverts commit 41dddc0287bb9ef14be8de3c3185ed6aaa809d98 and then tries a different approach because from the commit that originally introduced this:

commit 3dd25f235c73f7855dc570585eb2551961a1911a

Author: Benjamin Gaignard <[email protected]>
Date:   Wed Jul 26 14:07:49 2017 +0200

dim: add checks for author and committer sign-off-by

we have

"Use real names for people with many different email addresses."

to work around outlook we need to convert the "Last, First" firm into what git expects instead, which also should solve the problem Rodrigo has.

Cc Rodrigo Vivi <[email protected]>
Cc Jani Nikula <[email protected]>
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
dim +4 -2
index 5e8c4d5b212d..4d75c7a7fb0e 100755
@@ -698,11 +698,13 @@ function checkpatch_commit_push
 	sha1=$1
 
 	# use real names for people with many different email addresses
-	author=$(git show -s $sha1 --format="format:%ae")
+	author=$(git show -s $sha1 --format="format:%an")
 	committer=$(git show -s $sha1 --format="format:%cn")
+	# outlook mangles mails into "Last, First"
+	author_outlook=$(git show -s $sha1 --format="format:%an" | sed -e 's/\([^ ]*\) \(.*\)/\2, \1/')
 
 	# check for author sign-off
-	if ! git show -s $sha1 | grep -qi "S.*-by:.*$author"  ; then
+	if ! git show -s $sha1 | grep -qi "S.*-by:.*\\($author\\|$author_outlook\\)" ; then
 		warn_or_fail "$sha1 is lacking author of sign-off"
 	fi
 
Signature · 6 lines
2.14.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 2/3 dim: auto-add remotes

Well, bother to at least prompt. Prep work for adding drm-amd.git.

---
 dim | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
dim +8 -1
index 4d75c7a7fb0e..6ebbad2b6dfd 100755
@@ -274,7 +274,14 @@ function url_to_remote # url
 			echoerr "Please set it up using:"
 			echoerr "    $ git remote add <name> $url"
 			echoerr "with a name of your choice."
-			return 1
+			remote=${url%.git}
+			remote=${remote##*/}
+			read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true
+			if [[ "$REPLY" == "" ]] ; then
+				exit 1
+			fi
+
+			git remote add $remote $url
 		fi
 	fi
 
Signature · 6 lines
2.14.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Acked-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] dim: auto-add remotes

Quoted 12 lines · Daniel Vetter

Well, bother to at least prompt. Prep work for adding drm-amd.git.

---
 dim | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
dim +0 -0
index 4d75c7a7fb0e..6ebbad2b6dfd 100755

dim function url_to_remote # url · line 275

Quoted 2 lines
dim +0 -0
@@ -274,7 +274,14 @@ function url_to_remote # url
 			echoerr "Please set it up using:"
 			echoerr "    $ git remote add <name> $url"

I think these 2 messages above doesn't make sense anymore, right?

dim function url_to_remote # url · line 277

Quoted 2 lines
dim +0 -1
 			echoerr "with a name of your choice."
-			return 1

\o/
I like to see more automation on the setup...

dim function url_to_remote # url · line 279

Quoted 3 lines
dim +3 -0
+			remote=${url%.git}
+			remote=${remote##*/}
+			read -r -i "$remote" -e -p "Enter a name to auto-add this remote, leave blank to abort: " || true

I'd be more in favor of forcing a standard and be flexible on .dimrc to any later change if people really need that.

Anyways not blocking.
With messages above checked:

Quoted 15 lines
dim +5 -0
+			if [[ "$REPLY" == "" ]] ; then
+				exit 1
+			fi
+
+			git remote add $remote $url
 		fi
 	fi
 
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 3/3 dim: add drm-amd.git

In reply to Daniel Vetter

Unfortunately there's a little bit of hardcoded stuff still.

Cc Alex Deucher <[email protected]>
Cc Harry Wentland <[email protected]>
---
 dim | 1 +
 1 file changed, 1 insertion(+)
dim +1 -0
index 6ebbad2b6dfd..63ffebe14781 100755
@@ -761,6 +761,7 @@ function dim_push_branch
 
 	update_linux_next $branch drm-intel-next-queued drm-intel-next-fixes drm-intel-fixes
 	update_linux_next $branch drm-misc-next drm-misc-next-fixes drm-misc-fixes
+	update_linux_next $branch drm-amd-next drm-amd-next-fixes drm-amd-fixes
 
 	dim_rebuild_tip
 }
Signature · 6 lines
2.14.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Acked-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] dim: add drm-amd.git

Quoted 5 lines · Daniel Vetter

Unfortunately there's a little bit of hardcoded stuff still.

Cc Alex Deucher <[email protected]>
Cc Harry Wentland <[email protected]>
Quoted 23 lines
---
 dim | 1 +
 1 file changed, 1 insertion(+)
dim +1 -0
index 6ebbad2b6dfd..63ffebe14781 100755
@@ -761,6 +761,7 @@ function dim_push_branch
 
 	update_linux_next $branch drm-intel-next-queued drm-intel-next-fixes drm-intel-fixes
 	update_linux_next $branch drm-misc-next drm-misc-next-fixes drm-misc-fixes
+	update_linux_next $branch drm-amd-next drm-amd-next-fixes drm-amd-fixes
 
 	dim_rebuild_tip
 }
Signature · 6 lines
2.14.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by on v1 1/3
#5 lore raw
In reply to Daniel Vetter
Quoted 14 lines · Daniel Vetter

This reverts commit 41dddc0287bb9ef14be8de3c3185ed6aaa809d98 and then tries a different approach because from the commit that originally introduced this:

commit 3dd25f235c73f7855dc570585eb2551961a1911a

Author: Benjamin Gaignard <[email protected]>
Date:   Wed Jul 26 14:07:49 2017 +0200

dim: add checks for author and committer sign-off-by

we have

"Use real names for people with many different email addresses."

Quoted 7 lines

to work around outlook we need to convert the "Last, First" firm into what git expects instead, which also should solve the problem Rodrigo has.

Cc Rodrigo Vivi <[email protected]>
Cc Jani Nikula <[email protected]>
Quoted 27 lines
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
dim +4 -2
index 5e8c4d5b212d..4d75c7a7fb0e 100755
@@ -698,11 +698,13 @@ function checkpatch_commit_push
 	sha1=$1
 
 	# use real names for people with many different email addresses
-	author=$(git show -s $sha1 --format="format:%ae")
+	author=$(git show -s $sha1 --format="format:%an")
 	committer=$(git show -s $sha1 --format="format:%cn")
+	# outlook mangles mails into "Last, First"
+	author_outlook=$(git show -s $sha1 --format="format:%an" | sed -e 's/\([^ ]*\) \(.*\)/\2, \1/')
 
 	# check for author sign-off
-	if ! git show -s $sha1 | grep -qi "S.*-by:.*$author"  ; then
+	if ! git show -s $sha1 | grep -qi "S.*-by:.*\\($author\\|$author_outlook\\)" ; then
 		warn_or_fail "$sha1 is lacking author of sign-off"
 	fi
 
Signature · 1 line
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx