[PATCH 1/5] dim: exclude commits from subordinate trees in pull-request

[Jani Nikula]

On Wed, 23 May 2018, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> For trees which integrate other trees it's a bit much to show all the
> commits pulled in through those other trees - that should all be
> summarized already in the merge commit.
>
> Instead only show commits done in the local tree, whether that's
> merges or normal commits. --first-parent achieves that.
>
> Cc: Dave Airlie <airlied at gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Acked-by: Jani Nikula <jani.nikula at intel.com>


> ---
>  dim | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dim b/dim
> index 5308d07aee00..629fe1cb71be 100755
> --- a/dim
> +++ b/dim
> @@ -1764,7 +1764,7 @@ function dim_update_next
>  	$DRY git add drivers/gpu/drm/i915/i915_drv.h
>  	git commit $DRY_RUN -sm "drm/i915: Update DRIVER_DATE to $driver_date"
>  
> -	gitk drm-intel-next-queued ^$(repo_to_remote drm-upstream)/drm-next &
> +	gitk --first-parent drm-intel-next-queued ^$(repo_to_remote drm-upstream)/drm-next &
>  
>  	# try to push dinq first in case someone raced
>  	FORCE=1 dim_push_queued
> @@ -1864,7 +1864,7 @@ function dim_pull_request
>  		repo="drm-intel"
>  	else
>  		tag=$(tag_name "$branch")
> -		gitk "$branch" ^$upstream &
> +		gitk --first-parent "$branch" ^$upstream &
>  		tag_branch $tag $branch
>  		$DRY git push $remote $tag
>  		prep_pull_mail $req_file $tag

-- 
Jani Nikula, Intel Open Source Graphics Center