[DIM PATCH] dim: Don't use "@{upstream}" when running gitk for pulls

[Jani Nikula]

On Thu, 29 Mar 2018, Sean Paul <seanpaul at chromium.org> wrote:
> Use the local branch when launching gitk for the purpose of pull
> requests. Since the pull is generated from the local branch, this gives
> a view of exactly what will be sent, thus avoiding embarrassing empty
> pulls (*cough* [1] *cough*) or invalid tag summaries.

What's the scenario where these would be out of sync?

BR,
Jani.

>
> Cc: Dave Airlie <airlied at gmail.com>
> Signed-off-by: Sean Paul <seanpaul at chromium.org>
>
> [1]- https://lists.freedesktop.org/archives/dri-devel/2018-March/171055.html
> ---
>  dim | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index 29647f87381e..068efb674cd3 100755
> --- a/dim
> +++ b/dim
> @@ -1818,7 +1818,7 @@ function dim_pull_request
>  		repo="drm-intel"
>  	else
>  		tag=$(tag_name "$branch")
> -		gitk "$branch@{upstream}" ^$upstream &
> +		gitk "$branch" ^$upstream &
>  		tag_branch $tag $branch
>  		$DRY git push $remote $tag
>  		prep_pull_mail $req_file $tag

-- 
Jani Nikula, Intel Open Source Technology Center