summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2018-05-14 08:45:27 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-05-14 18:16:11 +0200
commit01c88ffb3d5b6bb67f3116ef24aadbe7675bda41 (patch)
tree37155a16d3d566f272705b7de3eb94add498aeab
parent3f56245f179352790620c92be996c165528a4b38 (diff)
dim: Fix -d for apply-pull
Lots of things we didn't mark up. Reported by Dave. Cc: Dave Airlie <airlied@gmail.com> Acked-by: Dave Airlie <airlied@gmail.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rwxr-xr-xdim8
1 files changed, 4 insertions, 4 deletions
diff --git a/dim b/dim
index 6b684ba5308c..29801b910481 100755
--- a/dim
+++ b/dim
@@ -952,14 +952,14 @@ function dim_apply_pull
return 1
else
- git add -u
- git commit --no-edit --quiet
+ $DRY git add -u
+ $DRY git commit --no-edit --quiet
fi
fi
- git commit --amend -s --no-edit
+ $DRY git commit --amend -s --no-edit
if [ -n "$message_id" ]; then
- dim_commit_add_tag "Link: https://patchwork.freedesktop.org/patch/msgid/$message_id"
+ $DRY dim_commit_add_tag "Link: https://patchwork.freedesktop.org/patch/msgid/$message_id"
fi