[v2] dim: Automatically sign-off patches from others
diff mbox

Message ID 1453803762-28734-1-git-send-email-tvrtko.ursulin@linux.intel.com
State New
Headers show

Commit Message

Tvrtko Ursulin Jan. 26, 2016, 10:22 a.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

It is very easy to forget that commiters should sign-off
patches not authored by themselves.

v2: Missed to make sob variable local and align with dim
    coding style. (Daniel Vetter)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 ...utomatically-sign-off-patches-from-others.patch | 34 ++++++++++++++++++++++
 dim                                                |  9 +++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 0001-dim-Automatically-sign-off-patches-from-others.patch

Patch
diff mbox

diff --git a/0001-dim-Automatically-sign-off-patches-from-others.patch b/0001-dim-Automatically-sign-off-patches-from-others.patch
new file mode 100644
index 000000000000..2e9e4bfb39be
--- /dev/null
+++ b/0001-dim-Automatically-sign-off-patches-from-others.patch
@@ -0,0 +1,34 @@ 
+From d14e55a4fb687a1237b1251bcc3d5cc29e1a7f5e Mon Sep 17 00:00:00 2001
+From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Date: Mon, 25 Jan 2016 17:23:34 +0000
+Subject: [PATCH] dim: Automatically sign-off patches from others
+
+It is very easy to forget that commiters should sign-off
+patches not authored by themselves.
+
+Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
+---
+ dim | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dim b/dim
+index c749cebd1187..ff5d89ca5df8 100755
+--- a/dim
++++ b/dim
+@@ -380,7 +380,11 @@ function dim_apply
+ 
+ 	dim_shell_checkpatch "cat $file"
+ 
+-	cat $file | git am -3 "$@"
++	local commiter_email=$(git config --get user.email)
++	local patch_from=$(grep "From:" "$file" | head -1)
++	[[ "$patch_from" == *"$commiter_email"* ]] || sob=-s
++
++	cat $file | git am -3 $sob "$@"
+ 
+ 	if [ -n "$message_id" ]; then
+ 		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"
+-- 
+1.9.1
+
diff --git a/dim b/dim
index c749cebd1187..7d1d7b1952f8 100755
--- a/dim
+++ b/dim
@@ -380,7 +380,14 @@  function dim_apply
 
 	dim_shell_checkpatch "cat $file"
 
-	cat $file | git am -3 "$@"
+	local commiter_email=$(git config --get user.email)
+	local patch_from=$(grep "From:" "$file" | head -1)
+	local sob
+	if [[ "$patch_from" != *"$commiter_email"* ]] ; then
+		sob=-s
+	fi
+
+	cat $file | git am -3 $sob "$@"
 
 	if [ -n "$message_id" ]; then
 		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"