From: Eric Sunshine <sunshine@sunshineco.com>
To: Rafael Silva <rafaeloliveira.cs@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [RFC PATCH 2/2] t2402: add test to locked linked worktree marker
Date: Wed, 30 Sep 2020 04:06:28 -0400 [thread overview]
Message-ID: <CAPig+cSa4JZ0SaM9p+Jfvv_5h8mexRcKdiz=hSi37BG_sLsk7Q@mail.gmail.com> (raw)
In-Reply-To: <20200928154953.30396-3-rafaeloliveira.cs@gmail.com>
On Mon, Sep 28, 2020 at 11:50 AM Rafael Silva
<rafaeloliveira.cs@gmail.com> wrote:
> Test the output of the `worktree list` command to show when
> a linked worktree is locked and test to not mistakenly
> mark main or unlocked worktrees.
In addition to Junio's review comments...
> Signed-off-by: Rafael Silva <rafaeloliveira.cs@gmail.com>
> ---
> diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
> @@ -61,6 +61,19 @@ test_expect_success '"list" all worktrees --porcelain' '
> +test_expect_success 'show locked worktree with (locked)' '
Existing test titles in this script seem to follow a particular
pattern (for the most part). Perhaps this could say instead:
test_expect_success '"list" all worktrees with "locked"' '
> + echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
I see that this is following existing practice in this script of
piling up $(git ...) invocations which can lose the individual exit
codes, so I can't complain about it, but I'll note that these days
we'd more likely than not try to preserve the exit codes, perhaps like
this:
path=$(git rev-parse --show-toplevel) &&
rev=$(git rev-parse --short HEAD) &&
sym=$(git symbolic-ref --short HEAD) &&
echo "$path $rev [$sym]" >expect &&
However, that gets verbose since you're doing it for multiple lines (below).
> + test_when_finished "rm -rf locked unlocked out actual expect && git worktree prune" &&
> + git worktree add --detach locked master &&
> + git worktree add --detach unlocked master &&
> + git worktree lock locked &&
> + echo "$(git -C locked rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD) (locked)" >>expect &&
> + echo "$(git -C unlocked rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
> + git worktree list >out &&
> + sed "s/ */ /g" <out >actual &&
> + test_cmp expect actual
> +'
I realize that Junio proposed an alternate simpler approach which
checks specifically the attribute in which you are interested, but
here's yet another (typed-in-email) approach you could use:
test_when_finished "..." &&
git worktree add --detach locked master &&
git worktree add --detach unlocked master &&
git worktree list >out &&
sed '/\/locked/s/$/ (locked)/' out >expect &&
git worktree lock locked &&
git worktree list >actual &&
test_cmp expect actual
next prev parent reply other threads:[~2020-09-30 8:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 15:49 [RFC PATCH 0/2] teach `worktree list` to mark locked worktrees Rafael Silva
2020-09-28 15:49 ` [RFC PATCH 1/2] worktree: teach `list` to mark locked worktree Rafael Silva
2020-09-28 21:37 ` Junio C Hamano
2020-09-29 21:36 ` Rafael Silva
2020-09-30 7:35 ` Eric Sunshine
2020-09-28 15:49 ` [RFC PATCH 2/2] t2402: add test to locked linked worktree marker Rafael Silva
2020-09-28 21:54 ` Junio C Hamano
2020-09-29 21:37 ` Rafael Silva
2020-09-30 8:06 ` Eric Sunshine [this message]
2020-09-28 21:19 ` [RFC PATCH 0/2] teach `worktree list` to mark locked worktrees Junio C Hamano
2020-09-29 21:35 ` Rafael Silva
2020-09-30 7:19 ` Eric Sunshine
2020-10-02 16:28 ` Rafael Silva
2020-10-09 22:50 ` Eric Sunshine
2020-10-10 19:06 ` Rafael Silva
2020-10-10 18:55 ` [PATCH v2 0/1] Teach "worktree list" to annotate " Rafael Silva
2020-10-10 18:55 ` [PATCH v2 1/1] worktree: teach `list` to annotate locked worktree Rafael Silva
2020-10-11 6:26 ` Eric Sunshine
2020-10-11 6:34 ` Eric Sunshine
2020-10-11 10:04 ` Rafael Silva
2020-10-11 10:11 ` [PATCH v3 0/1] Teach "worktree list" to annotate locked worktrees Rafael Silva
2020-10-11 10:11 ` [PATCH v3] worktree: teach `list` to annotate locked worktree Rafael Silva
2020-10-12 2:24 ` Eric Sunshine
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+cSa4JZ0SaM9p+Jfvv_5h8mexRcKdiz=hSi37BG_sLsk7Q@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=rafaeloliveira.cs@gmail.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).