From: Eric Sunshine <sunshine@sunshineco.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: Git List <git@vger.kernel.org>, Elijah Newren <newren@gmail.com>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH v2 3/8] refs: new ref types to make per-worktree refs visible to all worktrees
Date: Sun, 30 Sep 2018 01:13:28 -0400 [thread overview]
Message-ID: <CAPig+cTRNzhKhcmt7hnLHP=8Oc86EnokSDzDD4z2CGYFGmuz4Q@mail.gmail.com> (raw)
In-Reply-To: <20180929191029.13994-4-pclouds@gmail.com>
On Sat, Sep 29, 2018 at 3:10 PM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> The main worktree has to be treated specially because well.. it's
Nit: s/well../well.../
> special from the beginning. So HEAD from the main worktree is
> acccessible via the name "main-worktree/HEAD" instead of
> "worktrees/main/HEAD" because "main" could be just another secondary
> worktree.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> @@ -216,6 +217,18 @@ directly under GIT_DIR instead of inside GIT_DIR/refs. There are one
> +Refs that are per working tree can still be accessed from another
> +working tree via two special paths main-worktree and worktrees. The
s/paths/paths,/
> +former gives access to per-worktree refs of the main working tree,
> +while the former to all linked working trees.
s/former/latter/
> diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
> @@ -30,4 +30,50 @@ test_expect_success 'refs/worktree are per-worktree' '
> +test_expect_success 'ambiguous main-worktree/HEAD' '
> + mkdir -p .git/refs/heads/main-worktree &&
> + test_when_finished rm .git/refs/heads/main-worktree/HEAD &&
> + cp .git/HEAD .git/refs/heads/main-worktree/HEAD &&
Better to use "rm -f" for cleanup in case this 'cp' fails for some reason.
> + git rev-parse main-worktree/HEAD 2>warn >/dev/null &&
You could probably omit the /dev/null redirect.
> + grep "main-worktree/HEAD.*ambiguous" warn
> +'
> +
> +test_expect_success 'ambiguous worktrees/xx/HEAD' '
> + mkdir -p .git/refs/heads/worktrees/wt1 &&
> + test_when_finished rm .git/refs/heads/worktrees/wt1/HEAD &&
Ditto "rm -f".
> + cp .git/HEAD .git/refs/heads/worktrees/wt1/HEAD &&
> + git rev-parse worktrees/wt1/HEAD 2>warn >/dev/null &&
Ditto /dev/null.
> + grep "worktrees/wt1/HEAD.*ambiguous" warn
> +'
next prev parent reply other threads:[~2018-09-30 5:13 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-22 18:04 [PATCH 0/8] fix per-worktree ref iteration in fsck/reflog expire Nguyễn Thái Ngọc Duy
2018-09-22 18:04 ` [PATCH 1/8] refs.c: indent with tabs, not spaces Nguyễn Thái Ngọc Duy
2018-09-22 18:04 ` [PATCH 2/8] Add a place for (not) sharing stuff between worktrees Nguyễn Thái Ngọc Duy
2018-09-23 7:51 ` Eric Sunshine
2018-09-25 2:35 ` Stefan Beller
2018-09-25 15:36 ` Duy Nguyen
2018-09-25 16:24 ` Stefan Beller
2018-09-25 16:55 ` Duy Nguyen
2018-09-25 17:56 ` Stefan Beller
2018-09-22 18:04 ` [PATCH 3/8] refs: new ref types to make per-worktree refs visible to all worktrees Nguyễn Thái Ngọc Duy
2018-09-23 8:06 ` Eric Sunshine
2018-09-23 13:10 ` Duy Nguyen
2018-09-25 2:48 ` Stefan Beller
2018-09-25 15:49 ` Duy Nguyen
2018-09-25 16:53 ` Stefan Beller
2018-09-25 21:16 ` Junio C Hamano
2018-09-29 18:26 ` Duy Nguyen
2018-10-06 23:20 ` Junio C Hamano
2018-09-22 18:04 ` [PATCH 4/8] revision.c: correct a parameter name Nguyễn Thái Ngọc Duy
2018-09-22 18:04 ` [PATCH 5/8] revision.c: better error reporting on ref from different worktrees Nguyễn Thái Ngọc Duy
2018-09-23 8:25 ` Eric Sunshine
2018-09-23 13:15 ` Duy Nguyen
2018-09-22 18:04 ` [PATCH 6/8] fsck: Move fsck_head_link() to get_default_heads() to avoid some globals Nguyễn Thái Ngọc Duy
2018-09-22 18:04 ` [PATCH 7/8] fsck: check HEAD and reflog from other worktrees Nguyễn Thái Ngọc Duy
2018-09-23 8:41 ` Eric Sunshine
2018-09-29 18:40 ` Duy Nguyen
2018-09-22 18:05 ` [PATCH 8/8] reflog expire: cover reflog from all worktrees Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 0/8] fix per-worktree ref iteration in fsck/reflog expire Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 1/8] refs.c: indent with tabs, not spaces Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 2/8] Add a place for (not) sharing stuff between worktrees Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 3/8] refs: new ref types to make per-worktree refs visible to all worktrees Nguyễn Thái Ngọc Duy
2018-09-30 5:13 ` Eric Sunshine [this message]
2018-10-07 1:37 ` Junio C Hamano
2018-09-29 19:10 ` [PATCH v2 4/8] revision.c: correct a parameter name Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 5/8] revision.c: better error reporting on ref from different worktrees Nguyễn Thái Ngọc Duy
2018-09-30 5:25 ` Eric Sunshine
2018-09-29 19:10 ` [PATCH v2 6/8] fsck: Move fsck_head_link() to get_default_heads() to avoid some globals Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 7/8] fsck: check HEAD and reflog from other worktrees Nguyễn Thái Ngọc Duy
2018-09-29 19:10 ` [PATCH v2 8/8] reflog expire: cover reflog from all worktrees Nguyễn Thái Ngọc Duy
2018-09-30 5:36 ` Eric Sunshine
2018-10-02 16:16 ` Duy Nguyen
2018-10-03 7:49 ` Eric Sunshine
2018-10-21 8:08 ` [PATCH v3 0/8] fix per-worktree ref iteration in fsck/reflog expire Nguyễn Thái Ngọc Duy
2018-10-21 8:08 ` [PATCH v3 1/8] refs.c: indent with tabs, not spaces Nguyễn Thái Ngọc Duy
2018-10-21 8:08 ` [PATCH v3 2/8] Add a place for (not) sharing stuff between worktrees Nguyễn Thái Ngọc Duy
2018-10-22 4:28 ` Junio C Hamano
2018-10-29 17:18 ` Duy Nguyen
2018-10-22 10:25 ` SZEDER Gábor
2018-10-21 8:08 ` [PATCH v3 3/8] refs: new ref types to make per-worktree refs visible to all worktrees Nguyễn Thái Ngọc Duy
2018-11-24 19:27 ` Ævar Arnfjörð Bjarmason
2018-11-25 1:19 ` Junio C Hamano
2018-11-25 4:58 ` [PATCH] files-backend.c: fix build error on Solaris Nguyễn Thái Ngọc Duy
2018-11-25 10:19 ` Carlo Arenas
2018-11-25 10:40 ` Duy Nguyen
2018-11-26 4:44 ` Junio C Hamano
2018-10-21 8:08 ` [PATCH v3 4/8] revision.c: correct a parameter name Nguyễn Thái Ngọc Duy
2018-10-21 8:08 ` [PATCH v3 5/8] revision.c: better error reporting on ref from different worktrees Nguyễn Thái Ngọc Duy
2018-10-21 8:08 ` [PATCH v3 6/8] fsck: Move fsck_head_link() to get_default_heads() to avoid some globals Nguyễn Thái Ngọc Duy
2018-10-21 8:08 ` [PATCH v3 7/8] fsck: check HEAD and reflog from other worktrees Nguyễn Thái Ngọc Duy
2018-10-21 8:08 ` [PATCH v3 8/8] reflog expire: cover reflog from all worktrees Nguyễn Thái Ngọc Duy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPig+cTRNzhKhcmt7hnLHP=8Oc86EnokSDzDD4z2CGYFGmuz4Q@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).