From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH 2/2] dim: really make the branch argument for dim retip optional
Date: Tue, 21 Mar 2017 16:13:45 +0200 [thread overview]
Message-ID: <87shm6afae.fsf@intel.com> (raw)
In-Reply-To: <20170321125824.14641-2-daniel.vetter@ffwll.ch>
On Tue, 21 Mar 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Some didn't work, at least here.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-03-21 14:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 9:08 [PATCH 1/2] dim: Run gitk before tagging Daniel Vetter
2017-03-21 9:08 ` [PATCH 2/2] dim: Stop force-pushing tags Daniel Vetter
2017-03-21 11:44 ` Jani Nikula
2017-03-21 12:58 ` [PATCH 1/2] " Daniel Vetter
2017-03-21 12:58 ` [PATCH 2/2] dim: really make the branch argument for dim retip optional Daniel Vetter
2017-03-21 14:13 ` Jani Nikula [this message]
2017-03-21 15:27 ` Daniel Vetter
2017-03-22 8:42 ` Jani Nikula
2017-03-21 14:12 ` [PATCH 1/2] dim: Stop force-pushing tags Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87shm6afae.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).