[Intel-gfx] [dim PATCH 09/10] dim: avoid useless cat in apply-branch
Jani Nikula
jani.nikula at intel.com
Fri Mar 17 10:43:00 UTC 2017
Fix shellcheck SC2002: Useless cat. Consider 'cmd < file | ..' or 'cmd
file | ..' instead.
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
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
--
2.1.4
More information about the Intel-gfx
mailing list