From patchwork Fri Mar 17 10:43:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 9630305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46E8160249 for ; Fri, 17 Mar 2017 10:43:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3796B28632 for ; Fri, 17 Mar 2017 10:43:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C3BC286A4; Fri, 17 Mar 2017 10:43:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E803C28632 for ; Fri, 17 Mar 2017 10:43:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FDF06ECFC; Fri, 17 Mar 2017 10:43:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 966996ED00 for ; Fri, 17 Mar 2017 10:43:27 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP; 17 Mar 2017 03:43:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,176,1486454400"; d="scan'208";a="835811443" Received: from jnikula-mobl.fi.intel.com (HELO localhost) ([10.237.72.162]) by FMSMGA003.fm.intel.com with ESMTP; 17 Mar 2017 03:43:26 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2017 12:43:00 +0200 Message-Id: <64d2985ee21e5bfa846e531a557a3f50f8266853.1489746877.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [dim PATCH 09/10] dim: avoid useless cat in apply-branch X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Fix shellcheck SC2002: Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. Signed-off-by: Jani Nikula --- Makefile | 1 - dim | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 51da0dcc9dd3..ec04e75b41ec 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,6 @@ dim.html: dim.rst SC_EXCLUDE := \ -e SC2001 \ - -e SC2002 \ -e SC2005 \ -e SC2006 \ -e SC2034 \ diff --git a/dim b/dim index 0eac9f627932..6dbfbed5e8f7 100755 --- a/dim +++ b/dim @@ -675,7 +675,7 @@ function dim_apply_branch sob=-s fi - cat $file | git am --scissors -3 $sob "$@" + git am --scissors -3 $sob "$@" $file if [ -n "$message_id" ]; then dim_commit_add_tag "Link: http://patchwork.freedesktop.org/patch/msgid/$message_id" @@ -887,7 +887,7 @@ dim_alias_mrr=magic-rebase-resolve function dim_magic_rebase_resolve { git diff HEAD | patch -p1 -R - cat .git/rebase-merge/patch | dim_magic_patch + dim_magic_patch < .git/rebase-merge/patch make $DIM_MAKE_OPTIONS git add -u git rebase --continue