get_maintainer.pl needs a diff, so this script can't run on a merge
commit.

Signed-off-by: Eric Engestrom <eric.engest...@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"
+               return
+       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=''
-- 
Cheers,
  Eric

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to