threads / patch / 52935

patcht2402: test worktree path when called in .git directory

Subject: [PATCH] t2402: test worktree path when called in .git directory

## tl;dr

3 messages between Mar 4, 2020 and Mar 4, 2020. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Hariom Verma via GitGitGadget· Mar 4, 2020, 07:00 UTC · lore

From: Hariom Verma <hariom18599@gmail.com>

The bug which reports an extra `/.git/.` in worktree path when called in '.git' directory already has been fixed. But unfortunately, the regression test to ensure this behavior has been forgotten. Here is that test.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
---
    t2402: test worktree path when called in .git directory
    
    Regression test to ensure that the bug (i.e. extra /.git/. in worktree
    path when called in '.git' directory) has been fixed correctly.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-570%2Fharry-hov%2Fverify-get_main_worktree-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-570/harry-hov/verify-get_main_worktree-fix-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/570

 t/t2402-worktree-list.sh | 6 ++++++
 1 file changed, 6 insertions(+)

Show changes to t/t2402-worktree-list.sh +6 −0

diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index bb6fb9b12cb..ef397386dc7 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -151,4 +151,10 @@ test_expect_success 'linked worktrees are sorted' '
 	test_cmp expected sorted/main/actual
 '
 
+test_expect_success 'worktree path when called in .git directory' '
+	git worktree list> list1 &&
+	git -C .git worktree list> list2 &&
+	test_cmp list1 list2
+'
+
 test_done

base-commit: 4ef346482d6d5748861c1aa9d56712e847369b40

-- 
gitgitgadget

Eric Sunshine· Mar 4, 2020, 08:15 UTC · re: Hariom Verma via GitGitGadget · lore

Re: [PATCH] t2402: test worktree path when called in .git directory

On Wed, Mar 4, 2020 at 2:00 AM Hariom Verma via GitGitGadget <gitgitgadget@gmail.com> wrote:

> The bug which reports an extra `/.git/.` in worktree path when called in
> '.git' directory already has been fixed. But unfortunately, the regression
> test to ensure this behavior has been forgotten.
> Here is that test.

For readers not involved in the discussion, this test was requested by [1], but the topic graduated to "next" before it could be re-rolled. It probably ought to be queued atop 'hv/receive-denycurrent-everywhere'.

[1]: https://lore.kernel.org/git/CAPig+cTh-uu-obh9aeDOV9ptbVwRmkujgucbu9ei1Qa3qSNG_A@mail.gmail.com/

Show 7 quoted lines

> Signed-off-by: Hariom Verma <hariom18599@gmail.com>
> ---
> diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
> @@ -151,4 +151,10 @@ test_expect_success 'linked worktrees are sorted' '
> +test_expect_success 'worktree path when called in .git directory' '
> +       git worktree list> list1 &&
> +       git -C .git worktree list> list2 &&

Nit: Style is for the redirection operator to stick to the file:

    git worktree list >list1 &&
    git -C .git worktree list >list2 &&

> +       test_cmp list1 list2
> +'

The test itself makes sense.

Junio C Hamano· Mar 4, 2020, 16:20 UTC · re: Eric Sunshine · lore

Re: [PATCH] t2402: test worktree path when called in .git directory

Eric Sunshine <sunshine@sunshineco.com> writes:

Show 13 quoted lines

> On Wed, Mar 4, 2020 at 2:00 AM Hariom Verma via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>> The bug which reports an extra `/.git/.` in worktree path when called in
>> '.git' directory already has been fixed. But unfortunately, the regression
>> test to ensure this behavior has been forgotten.
>> Here is that test.
>
> For readers not involved in the discussion, this test was requested by
> [1], but the topic graduated to "next" before it could be re-rolled.
> It probably ought to be queued atop
> 'hv/receive-denycurrent-everywhere'.
>
> [1]: https://lore.kernel.org/git/CAPig+cTh-uu-obh9aeDOV9ptbVwRmkujgucbu9ei1Qa3qSNG_A@mail.gmail.com/

Your notes to those watching from sidelines are greatly appreciated.

Show 9 quoted lines

>> Signed-off-by: Hariom Verma <hariom18599@gmail.com>
>> ---
>> diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
>> @@ -151,4 +151,10 @@ test_expect_success 'linked worktrees are sorted' '
>> +test_expect_success 'worktree path when called in .git directory' '
>> +       git worktree list> list1 &&
>> +       git -C .git worktree list> list2 &&
>
> Nit: Style is for the redirection operator to stick to the file:

;-)  Thanks for being a careful reader.

Show 7 quoted lines

>     git worktree list >list1 &&
>     git -C .git worktree list >list2 &&
>
>> +       test_cmp list1 list2
>> +'
>
> The test itself makes sense.