Re: [PATCH v2 3/4] t2027-worktree-list: add and adjust tests related to git-rev-parse
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Apr 29, 2016, 14:22 UTC
- Message-ID
- <20160429142248.16496-1-szeder@ira.uka.de>
- In-Reply-To
- <1461361992-91918-4-git-send-email-rappazzo@gmail.com>
[Resend to list, sorry for the duplicates...]
Show 22 quoted lines
> Adjust the incorrect expectation for `rev-parse --git-common-dir`. > > Add a test for `git rev-parse --git-path` executed from a linked > worktree. > > Signed-off-by: Michael Rappazzo <rappazzo@gmail.com> > --- > t/t2027-worktree-list.sh | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/t/t2027-worktree-list.sh b/t/t2027-worktree-list.sh > index 1b1b65a..16eec6e 100755 > --- a/t/t2027-worktree-list.sh > +++ b/t/t2027-worktree-list.sh > @@ -14,10 +14,18 @@ test_expect_success 'rev-parse --git-common-dir on main worktree' ' > test_cmp expected actual && > mkdir sub && > git -C sub rev-parse --git-common-dir >actual2 && > - echo sub/.git >expected2 && > + echo ../.git >expected2 && > test_cmp expected2 actual2 > '
This hunk must go into patch 1/4.
The full test suite should pass after every single commit. As patch 1/4 fixes things, the changing behavior makes this test case fail, resulting in two commits in which 'make test' would fail.
Show 13 quoted lines
> +test_expect_success 'rev-parse --git-path objects linked worktree' ' > + echo "$(git rev-parse --show-toplevel)/.git/worktrees/linked-tree/objects" >expect && > + test_when_finished "rm -rf linked-tree && git worktree prune" && > + git worktree add --detach linked-tree master && > + git -C linked-tree rev-parse --git-path objects >actual && > + test_cmp expect actual > +' > + > test_expect_success '"list" all worktrees from main' ' > echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect && > test_when_finished "rm -rf here && git worktree prune" && > -- > 2.8.0