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] dim: Add support for native git worktrees
Date: Fri, 18 Dec 2015 12:07:30 +0200 [thread overview]
Message-ID: <87fuz0cbod.fsf@intel.com> (raw)
In-Reply-To: <1450341760-27556-1-git-send-email-daniel.vetter@ffwll.ch>
On Thu, 17 Dec 2015, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> git 2.5 gained native support for worktrees, so let's use them.
>
> Since this is fairly new I don't think we should switch the general
> dim setup over to using it (for e.g. the maintainer-tools and other
> auxiliary branches) since 2.5 was only released July 2015.
Ack.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> dim | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index e30fc84a8567..854b5a61b399 100755
> --- a/dim
> +++ b/dim
> @@ -556,7 +556,14 @@ function create_workdir
>
> echo Creating separate workdir for $branch
>
> - $DRY git-new-workdir ${DIM_DRM_INTEL} $branch $branch
> + if git help worktree &> /dev/null; then
> + # native worktree support was added in git 2.5
> + cd $DIM_DRM_INTEL
> + $DRY git worktree add $DIM_PREFIX/$branch $branch
> + cd $DIM_PREFIX
> + else
> + $DRY git-new-workdir $DIM_DRM_INTEL $branch $branch
> + fi
> done
> }
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2015-12-18 10:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 8:42 [PATCH] dim: Add support for native git worktrees Daniel Vetter
2015-12-18 10:07 ` Jani Nikula [this message]
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=87fuz0cbod.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