On Tue, 21 Mar 2017, Daniel Vetter <daniel@xxxxxxxx> wrote: > On Tue, Mar 21, 2017 at 04:13:45PM +0200, Jani Nikula wrote: >> On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: >> > Some didn't work, at least here. >> > >> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> >> > --- >> > 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. > > Nah, "dim retip" alone fails. The shift doesn't have anything to shift and > the cmd fails silently. This isn't on a worktree or anything, it's all > in the main checkout. Right. I suck. *facepalm*. J. -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
