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

[Sean Paul]

On Thu, Mar 29, 2018 at 9:54 AM Jani Nikula <jani.nikula at linux.intel.com>
wrote:

> 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?
>

If the local branch is behind the upstream branch. This could be
intentional or unintentional.

Intentional: I sometimes will want to cut a tag at a certain point if I'm
sending -misc-next pulls
Unintentional: As was the case last night, I sometimes forget to run dim
update-branches

In both of these cases, I want the gitk output to show me what I'm tagging
instead of what is in the upstream branch.

Sean


>
> 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dim-tools/attachments/20180329/1f1da9a3/attachment.html>