diff mbox

[dim,09/10] dim: avoid useless cat in apply-branch

Message ID 64d2985ee21e5bfa846e531a557a3f50f8266853.1489746877.git.jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula March 17, 2017, 10:43 a.m. UTC 
Fix shellcheck SC2002: Useless cat. Consider 'cmd < file | ..' or 'cmd
file | ..' instead.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 Makefile | 1 -
 dim      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
diff mbox

Patch

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