From: Jani Nikula <jani.nikula@intel.com>
To: Eric Engestrom <eric.engestrom@imgtec.com>,
intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org
Subject: Re: [maintainer-tools PATCH 1/7] dim: don't run add-missing-cc on merge commits
Date: Wed, 09 Aug 2017 15:55:12 +0300 [thread overview]
Message-ID: <87wp6cuci7.fsf@intel.com> (raw)
In-Reply-To: <20170809111101.11315-1-eric.engestrom@imgtec.com>
On Wed, 09 Aug 2017, Eric Engestrom <eric.engestrom@imgtec.com> wrote:
> get_maintainer.pl needs a diff, so this script can't run on a merge
> commit.
>
> Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
> ---
> dim | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/dim b/dim
> index 619d855b321b..af1baa11c7b2 100755
> --- a/dim
> +++ b/dim
> @@ -1960,6 +1960,11 @@ function dim_fixes
>
> function dim_add_missing_cc
> {
> + if [ $(git cat-file -p HEAD | grep -cE ^parent) -ne 1 ]; then
> + echoerr "This script doesn't work on merge commits"
To be pedantic, it's the subcommand that fails on merges, not the
script.
> + return
Please return 1.
BR,
Jani.
> + fi
> +
> git show | scripts/get_maintainer.pl --email --norolestats --pattern-depth 1 | while read cc; do
> email="$(echo "$cc" | sed -e 's/.*<//' -e 's/>.*//')"
> name=''
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2017-08-09 12:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 11:10 [maintainer-tools PATCH 1/7] dim: don't run add-missing-cc on merge commits Eric Engestrom
2017-08-09 11:10 ` [maintainer-tools PATCH 2/7] dim: fix end-of-line in regex Eric Engestrom
2017-08-09 12:57 ` Jani Nikula
2017-08-09 11:10 ` [maintainer-tools PATCH 3/7] dim: split out email parsing functions Eric Engestrom
2017-08-09 13:00 ` Jani Nikula
2017-08-09 11:10 ` [maintainer-tools PATCH 4/7] dim: merge string substitutions Eric Engestrom
2017-08-09 11:10 ` [maintainer-tools PATCH 5/7] dim: move empty name logic to function Eric Engestrom
2017-08-09 11:11 ` [maintainer-tools PATCH 6/7] dim: split out 'is email cc'ed in latest commit' to a function Eric Engestrom
2017-08-09 11:11 ` [maintainer-tools PATCH 7/7] dim: protect against escaped chars when reading cc'ed emails Eric Engestrom
2017-08-09 12:55 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wp6cuci7.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric.engestrom@imgtec.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).