[Intel-gfx] [maintainer-tools PATCH 24/30] qf: SC2155 - Fix another shellcheck complain

Rodrigo Vivi rodrigo.vivi at intel.com
Mon Aug 21 20:11:14 UTC 2017


 ^-- SC2155: Declare and assign separately to avoid masking return values.

Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Jani Nikula <jani.nikula at intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 qf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qf b/qf
index cbe8a69e1a83..0bd6ebf1370d 100755
--- a/qf
+++ b/qf
@@ -154,14 +154,16 @@ function branch_init
 
 function quilt_clean_check
 {
-	local current_top=$(quilt top)
+	local current_top quilt_changes
+
+	current_top=$(quilt top)
 
 	if [[ -n $(quilt unapplied $current_top) ]] ; then
 		echo Unapplied quilt patches, aborting.
 		exit 9
 	fi
 
-	local quilt_changes=$(cd patches ; git status --porcelain)
+	quilt_changes=$(cd patches ; git status --porcelain)
 
 	if [[ -n $quilt_changes ]] ; then
 		echo Uncommitted changes in the quilt patch repo, aborting.
-- 
2.13.2



More information about the Intel-gfx mailing list