[Intel-gfx] [maintainer-tools PATCH 2/4] dim: remove dim cherry-pick-branch subcommand

[Rodrigo Vivi]

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>


On Fri, Aug 11, 2017 at 06:03:23PM +0300, Jani Nikula wrote:
> Demote dim_cherry_pick_branch to an internal function. It's too
> specialized (at least for now) to be useful for anything other than as a
> helper for the cherry-pick-fixes and cherry-pick-next-fixes subcommands.
> 
> As a side effect, fixes mancheck for missing documentation for the
> subcommand.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  dim | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/dim b/dim
> index 2b377cb3a3f3..2f8da975c36a 100755
> --- a/dim
> +++ b/dim
> @@ -987,7 +987,7 @@ function git_list_fixes
>  	    "$@"
>  }
>  
> -function dim_cherry_pick_branch
> +function cherry_pick_branch
>  {
>  	local branch log fail_log needed have_fixes
>  
> @@ -1057,13 +1057,13 @@ function dim_cherry_pick_branch
>  function dim_cherry_pick_fixes
>  {
>  	assert_branch drm-intel-fixes
> -	dim_cherry_pick_branch drm-intel-fixes "$@"
> +	cherry_pick_branch drm-intel-fixes "$@"
>  }
>  
>  function dim_cherry_pick_next_fixes
>  {
>  	assert_branch drm-intel-next-fixes
> -	dim_cherry_pick_branch drm-intel-next-fixes "$@"
> +	cherry_pick_branch drm-intel-next-fixes "$@"
>  }
>  
>  dim_alias_ar=apply-resolved
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx