[PATCH] fixup! worktree move: new command
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 25, 2017, 13:04 UTC
- Message-ID
- <4f4ae057cd4d72d5b945a856deacd921fb5e7977.1485349447.git.johannes.schindelin@gmx.de>
This is required for the test to pass on Windows, where $TRASH_DIRECTORY is a POSIX path, while Git works with Windows paths instead. Using `$(pwd)` is the common workaround: it reports a Windows path (while `$PWD` would report the POSIX equivalent which, however, would only be understood by shell and Perl scripts).
Duy, if you re-roll the `worktree-move` patch series, would you terribly mind squashing this in?
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- Based-On: pu at https://github.com/dscho/git Fetch-Base-Via: git fetch https://github.com/dscho/git pu Published-As: https://github.com/dscho/git/releases/tag/nd/worktree-move-fixup-v1 Fetch-It-Via: git fetch https://github.com/dscho/git nd/worktree-move-fixup-v1
t/t2028-worktree-move.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh index 084acc6c6d..b3105eaaed 100755 --- a/t/t2028-worktree-move.sh +++ b/t/t2028-worktree-move.sh @@ -71,13 +71,14 @@ 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 | grep "^worktree" >actual && cat <<-EOF >expected && - worktree $TRASH_DIRECTORY - worktree $TRASH_DIRECTORY/destination - worktree $TRASH_DIRECTORY/elsewhere + worktree $toplevel + worktree $toplevel/destination + worktree $toplevel/elsewhere EOF test_cmp expected actual && git -C destination log --format=%s >actual2 && base-commit: 8ef3497bf10296c74058e87d9c5b93372cad5137
-- 2.11.0.windows.3.498.g86d49cc