On Tue, 21 Mar 2017, Daniel Vetter <[email protected]> wrote:
> Some didn't work, at least here.
>
> Signed-off-by: Daniel Vetter <[email protected]>
> ---
>  dim | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index e0c1909653b6..d7dcea625702 100755
> --- a/dim
> +++ b/dim
> @@ -388,7 +388,13 @@ function dim_retip
>       local branch upstream remote
>  
>       branch="$1"
> -     shift
> +
> +     if [ -n "$branch" ] ; then
> +             shift
> +     else
> +             branch=$(git symbolic-ref --short HEAD)
> +     fi

I guess this happens with worktrees? Ack if it works for you.

BR,
Jani.

> +
>       remote=$(url_to_remote $drm_tip_ssh)
>       upstream=$(git_find_tip "$branch")

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to