mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/worktree-move'

Browse Source 
Test update.

* nd/worktree-move:
  t2028: tighten grep expression to make "move worktree" test more robust
This commit is contained in:
Junio C Hamano
2018-04-25 13:28:54 +09:00
parent 4cbaa6b47f b1801b85a3
commit 03f78e1434
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/t2028-worktree-move.sh
View File

@ -72,12 +72,11 @@ test_expect_success 'move locked worktree' '
' '
test_expect_success 'move worktree' ' test_expect_success 'move worktree' '
toplevel="$(pwd)" &&
git worktree move source destination && git worktree move source destination &&
test_path_is_missing source && test_path_is_missing source &&
git worktree list --porcelain >out && git worktree list --porcelain >out &&
grep "^worktree.*/destination" out && grep "^worktree.*/destination$" out &&
! grep "^worktree.*/source" out && ! grep "^worktree.*/source$" out &&
git -C destination log --format=%s >actual2 && git -C destination log --format=%s >actual2 &&
echo init >expected2 && echo init >expected2 &&
test_cmp expected2 actual2 test_cmp expected2 actual2
@ -93,7 +92,7 @@ test_expect_success 'move worktree to another dir' '
test_when_finished "git worktree move some-dir/destination destination" && test_when_finished "git worktree move some-dir/destination destination" &&
test_path_is_missing destination && test_path_is_missing destination &&
git worktree list --porcelain >out && git worktree list --porcelain >out &&
grep "^worktree.*/some-dir/destination" out && grep "^worktree.*/some-dir/destination$" out &&
git -C some-dir/destination log --format=%s >actual2 && git -C some-dir/destination log --format=%s >actual2 &&
echo init >expected2 && echo init >expected2 &&
test_cmp expected2 actual2 test_cmp expected2 actual2