[Intel-gfx] [maintainer-tools PATCH v2 02/33] dim: rename dim_apply to dim_apply_branch
Jani Nikula
jani.nikula at intel.com
Thu Jan 28 05:26:56 PST 2016
Rename to match the subcommand name.
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
dim | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dim b/dim
index faa98114a027..aee6e4b87b14 100755
--- a/dim
+++ b/dim
@@ -369,7 +369,7 @@ function dim_push_branch
# ensure we're on branch $1, and apply patches. the rest of the arguments are
# passed to git am.
-function dim_apply
+function dim_apply_branch
{
local branch=$1
shift
@@ -806,16 +806,16 @@ case "$subcommand" in
dim_co drm-intel-next-fixes
;;
apply-branch|ab|sob)
- dim_apply "$@"
+ dim_apply_branch "$@"
;;
apply-queued|aq)
- dim_apply drm-intel-next-queued "$@"
+ dim_apply_branch drm-intel-next-queued "$@"
;;
apply-fixes|af)
- dim_apply drm-intel-fixes "$@"
+ dim_apply_branch drm-intel-fixes "$@"
;;
apply-next-fixes|anf)
- dim_apply drm-intel-next-fixes "$@"
+ dim_apply_branch drm-intel-next-fixes "$@"
;;
apply-resolved|ar)
make -j 20 && git add -u && git am --resolved
--
2.1.4
More information about the Intel-gfx
mailing list