[DIM PATCH 3/3] dim: Don't use --set-upstream

[Sean Paul]

On Mon, May 14, 2018 at 12:22 PM Daniel Vetter <daniel at ffwll.ch> wrote:

> On Mon, May 14, 2018 at 10:00:46AM -0400, Sean Paul wrote:
> > According to the manpage, it's deprecated, so use --set-upstream-to
> > instead.
> >
> > Signed-off-by: Sean Paul <seanpaul at chromium.org>

> I checked the only copy and there's no such notice:

> https://git-scm.com/docs/git-push

> Where did you find that this is deprecated?

Turns out I had branch open while I was looking for push. Here's the
relevant bit:

https://git-scm.com/docs/git-branch#git-branch---set-upstream

At least my intentions were noble! I'll drop this and send another version
with the comment.

Sean


Sean

> -Daniel

> > ---
> >  dim | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/dim b/dim
> > index 171557774ea4..7cb22bb85d14 100755
> > --- a/dim
> > +++ b/dim
> > @@ -1277,7 +1277,9 @@ function dim_create_branch
> >       fi
> >
> >       $DRY git branch $branch $start
> > -     $DRY git push $remote +$branch --set-upstream
> > +     $DRY git push $remote +$branch
> > +     $DRY git checkout $branch
> > +     $DRY git branch --set-upstream-to="$remote/$branch"
> >
> >
> >       cd $DIM_PREFIX/drm-rerere
> > --
> > Sean Paul, Software Engineer, Google / Chromium OS
> >
> > _______________________________________________
> > dim-tools mailing list
> > dim-tools at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dim-tools

> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch