diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 04:28:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 04:28:54 (GMT) |
| commit | 03f78e143474de2246ab06dbc26bc41245bc70f9 (patch) | |
| tree | e22fc85560851e37bf6a238f4ccbe0e5c096393f /t | |
| parent | 4cbaa6b47fbdcf68bd06d4a6ebf550153fb18636 (diff) | |
| parent | b1801b85a32e21a7e83d165b029b5115ab0f8167 (diff) | |
| download | git-03f78e143474de2246ab06dbc26bc41245bc70f9.zip git-03f78e143474de2246ab06dbc26bc41245bc70f9.tar.gz git-03f78e143474de2246ab06dbc26bc41245bc70f9.tar.bz2 | |
Merge branch 'nd/worktree-move'
Test update.
* nd/worktree-move:
t2028: tighten grep expression to make "move worktree" test more robust
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2028-worktree-move.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh index 5d5b363..5f7d45b 100755 --- a/t/t2028-worktree-move.sh +++ b/t/t2028-worktree-move.sh @@ -72,12 +72,11 @@ test_expect_success 'move locked worktree' ' ' test_expect_success 'move worktree' ' - toplevel="$(pwd)" && git worktree move source destination && test_path_is_missing source && git worktree list --porcelain >out && - grep "^worktree.*/destination" out && - ! grep "^worktree.*/source" out && + grep "^worktree.*/destination$" out && + ! grep "^worktree.*/source$" out && git -C destination log --format=%s >actual2 && echo init >expected2 && 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_path_is_missing destination && 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 && echo init >expected2 && test_cmp expected2 actual2 |