All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [dim PATCH 4/7] dim: return exit code from checkpatch_commit
Date: Thu, 23 Mar 2017 12:06:19 +0200	[thread overview]
Message-ID: <1490263582-6808-4-git-send-email-jani.nikula@intel.com> (raw)
In-Reply-To: <1490263582-6808-1-git-send-email-jani.nikula@intel.com>

Return the exit code to let callers make better decisions on what to do.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dim b/dim
index e6943d34c43f..c282782b429d 100755
--- a/dim
+++ b/dim
@@ -697,7 +697,7 @@ function dim_apply_branch
 		echo "No message-id found in the patch file."
 	fi
 
-	checkpatch_commit HEAD
+	checkpatch_commit HEAD || true
 	check_maintainer $branch HEAD
 
 	eval $DRY $DIM_POST_APPLY_ACTION
@@ -893,7 +893,7 @@ dim_alias_ar=apply-resolved
 function dim_apply_resolved
 {
 	make $DIM_MAKE_OPTIONS && git add -u && git am --resolved
-	checkpatch_commit HEAD
+	checkpatch_commit HEAD || true
 
 	eval $DRY $DIM_POST_APPLY_ACTION
 }
@@ -1103,17 +1103,22 @@ function check_maintainer
 # $1 is the git sha1 to check
 function checkpatch_commit
 {
-	local commit cmd bug_lines non_i915_files
+	local commit cmd bug_lines non_i915_files rv
 
 	commit=$1
 	cmd="git show --pretty=email $commit"
 
 	git --no-pager log --oneline -1 $commit
-	$cmd | scripts/checkpatch.pl -q --emacs --strict - || true
+	if ! $cmd | scripts/checkpatch.pl -q --emacs --strict -; then
+		rv=1
+	fi
 
 	if bug_lines=$($cmd | grep -m 1 -B 1 '^\+.*\WBUG' | grep -c '^[+-].*\WBUG') && [[ "$bug_lines" = "1" ]]; then
 		echoerr "WARNING: New BUG macro added"
+		rv=1
 	fi
+
+	return $rv
 }
 
 # turn $1 in to a git commit range
-- 
2.1.4

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

  parent reply	other threads:[~2017-03-23 10:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-23 10:06 [dim PATCH 1/7] dim: don't fail on grep not matching Jani Nikula
2017-03-23 10:06 ` [dim PATCH 2/7] dim: abstract and fix maintainer scope check for dinq Jani Nikula
2017-03-23 10:06 ` [dim PATCH 3/7] dim: only issue warnings on new BUG macros Jani Nikula
2017-03-23 10:06 ` Jani Nikula [this message]
2017-03-23 10:06 ` [dim PATCH 5/7] dim: make dim checkpatch subcommand return exit codes Jani Nikula
2017-03-23 10:06 ` [dim PATCH 6/7] dim: make dim apply-branch " Jani Nikula
2017-03-23 10:06 ` [dim PATCH 7/7] dim: propagate errors from check_maintainer Jani Nikula
2017-03-23 14:33   ` Daniel Vetter
2017-03-23 14:31 ` [dim PATCH 1/7] dim: don't fail on grep not matching Daniel Vetter

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=1490263582-6808-4-git-send-email-jani.nikula@intel.com \
    --to=jani.nikula@intel.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 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.