* [PATCH 1/3] dim: redo the author sob checks
@ 2017-09-27 9:48 Daniel Vetter
2017-09-27 9:48 ` [PATCH 2/3] dim: auto-add remotes Daniel Vetter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel Vetter @ 2017-09-27 9:48 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Jani Nikula, Daniel Vetter, Daniel Vetter, DRI Development, Rodrigo Vivi
This reverts commit 41dddc0287bb9ef14be8de3c3185ed6aaa809d98 and then
tries a different approach because from the commit that originally
introduced this:
commit 3dd25f235c73f7855dc570585eb2551961a1911a
Author: Benjamin Gaignard <benjamin.gaignard@linaro.org>
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 <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
dim | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dim b/dim
index 5e8c4d5b212d..4d75c7a7fb0e 100755
--- a/dim
+++ b/dim
@@ -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
--
2.14.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] dim: auto-add remotes
2017-09-27 9:48 [PATCH 1/3] dim: redo the author sob checks Daniel Vetter
@ 2017-09-27 9:48 ` Daniel Vetter
2017-09-27 15:48 ` Rodrigo Vivi
2017-09-27 9:48 ` [PATCH 3/3] dim: add drm-amd.git Daniel Vetter
2017-09-27 15:41 ` [PATCH 1/3] dim: redo the author sob checks Rodrigo Vivi
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2017-09-27 9:48 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, DRI Development
Well, bother to at least prompt. Prep work for adding drm-amd.git.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
dim | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dim b/dim
index 4d75c7a7fb0e..6ebbad2b6dfd 100755
--- a/dim
+++ b/dim
@@ -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
--
2.14.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] dim: add drm-amd.git
2017-09-27 9:48 [PATCH 1/3] dim: redo the author sob checks Daniel Vetter
2017-09-27 9:48 ` [PATCH 2/3] dim: auto-add remotes Daniel Vetter
@ 2017-09-27 9:48 ` Daniel Vetter
2017-09-27 15:48 ` Rodrigo Vivi
2017-09-27 15:41 ` [PATCH 1/3] dim: redo the author sob checks Rodrigo Vivi
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2017-09-27 9:48 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Alex Deucher, Daniel Vetter, DRI Development
Unfortunately there's a little bit of hardcoded stuff still.
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
dim | 1 +
1 file changed, 1 insertion(+)
diff --git a/dim b/dim
index 6ebbad2b6dfd..63ffebe14781 100755
--- a/dim
+++ b/dim
@@ -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
}
--
2.14.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] dim: redo the author sob checks
2017-09-27 9:48 [PATCH 1/3] dim: redo the author sob checks Daniel Vetter
2017-09-27 9:48 ` [PATCH 2/3] dim: auto-add remotes Daniel Vetter
2017-09-27 9:48 ` [PATCH 3/3] dim: add drm-amd.git Daniel Vetter
@ 2017-09-27 15:41 ` Rodrigo Vivi
2 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2017-09-27 15:41 UTC (permalink / raw)
To: Daniel Vetter
Cc: Jani Nikula, Daniel Vetter, Intel Graphics Development, DRI Development
On Wed, Sep 27, 2017 at 09:48:48AM +0000, Daniel Vetter wrote:
> This reverts commit 41dddc0287bb9ef14be8de3c3185ed6aaa809d98 and then
> tries a different approach because from the commit that originally
> introduced this:
>
> commit 3dd25f235c73f7855dc570585eb2551961a1911a
> Author: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> 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 <rodrigo.vivi@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> dim | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/dim b/dim
> index 5e8c4d5b212d..4d75c7a7fb0e 100755
> --- a/dim
> +++ b/dim
> @@ -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
>
> --
> 2.14.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] dim: auto-add remotes
2017-09-27 9:48 ` [PATCH 2/3] dim: auto-add remotes Daniel Vetter
@ 2017-09-27 15:48 ` Rodrigo Vivi
0 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2017-09-27 15:48 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development, DRI Development
On Wed, Sep 27, 2017 at 09:48:49AM +0000, Daniel Vetter wrote:
> Well, bother to at least prompt. Prep work for adding drm-amd.git.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> dim | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index 4d75c7a7fb0e..6ebbad2b6dfd 100755
> --- a/dim
> +++ b/dim
> @@ -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?
> echoerr "with a name of your choice."
> - return 1
\o/
I like to see more automation on the setup...
> + 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:
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> + if [[ "$REPLY" == "" ]] ; then
> + exit 1
> + fi
> +
> + git remote add $remote $url
> fi
> fi
>
> --
> 2.14.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] dim: add drm-amd.git
2017-09-27 9:48 ` [PATCH 3/3] dim: add drm-amd.git Daniel Vetter
@ 2017-09-27 15:48 ` Rodrigo Vivi
0 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2017-09-27 15:48 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Alex Deucher, Intel Graphics Development, DRI Development
On Wed, Sep 27, 2017 at 09:48:50AM +0000, Daniel Vetter wrote:
> Unfortunately there's a little bit of hardcoded stuff still.
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> dim | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/dim b/dim
> index 6ebbad2b6dfd..63ffebe14781 100755
> --- a/dim
> +++ b/dim
> @@ -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
> }
> --
> 2.14.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-27 15:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-27 9:48 [PATCH 1/3] dim: redo the author sob checks Daniel Vetter
2017-09-27 9:48 ` [PATCH 2/3] dim: auto-add remotes Daniel Vetter
2017-09-27 15:48 ` Rodrigo Vivi
2017-09-27 9:48 ` [PATCH 3/3] dim: add drm-amd.git Daniel Vetter
2017-09-27 15:48 ` Rodrigo Vivi
2017-09-27 15:41 ` [PATCH 1/3] dim: redo the author sob checks Rodrigo Vivi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.