Skip to content

Commit 03f78e1

Browse files
committed
Merge branch 'nd/worktree-move'
Test update. * nd/worktree-move: t2028: tighten grep expression to make "move worktree" test more robust
2 parents 4cbaa6b + b1801b8 commit 03f78e1

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

t/t2028-worktree-move.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@ test_expect_success 'move locked worktree' '
7272
'
7373

7474
test_expect_success 'move worktree' '
75-
toplevel="$(pwd)" &&
7675
git worktree move source destination &&
7776
test_path_is_missing source &&
7877
git worktree list --porcelain >out &&
79-
grep "^worktree.*/destination" out &&
80-
! grep "^worktree.*/source" out &&
78+
grep "^worktree.*/destination$" out &&
79+
! grep "^worktree.*/source$" out &&
8180
git -C destination log --format=%s >actual2 &&
8281
echo init >expected2 &&
8382
test_cmp expected2 actual2
@@ -93,7 +92,7 @@ test_expect_success 'move worktree to another dir' '
9392
test_when_finished "git worktree move some-dir/destination destination" &&
9493
test_path_is_missing destination &&
9594
git worktree list --porcelain >out &&
96-
grep "^worktree.*/some-dir/destination" out &&
95+
grep "^worktree.*/some-dir/destination$" out &&
9796
git -C some-dir/destination log --format=%s >actual2 &&
9897
echo init >expected2 &&
9998
test_cmp expected2 actual2

0 commit comments

Comments
 (0)