On 15/11/16 20:28, Ramsay Jones wrote:
> 
> Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
> ---
> 
> Hi Duy,
> 
> If you need to re-roll your 'nd/worktree-move' branch, could you
> please squash this into the relevant patch [commit c49e92f5c
> ("worktree move: refuse to move worktrees with submodules", 12-11-2016)].
> 
> Also, one of the new tests introduced by commit 31a8f3066 ("worktree move:
> new command", 12-11-2016), fails for me, thus:
> 
>   $ ./t2028-worktree-move.sh -i -v
>   ...
>   --- expected        2016-11-15 20:22:50.647241458 +0000
>   +++ actual  2016-11-15 20:22:50.647241458 +0000
>   @@ -1,3 +1,3 @@
>    worktree /home/ramsay/git/t/trash directory.t2028-worktree-move
>   -worktree /home/ramsay/git/t/trash directory.t2028-worktree-move/destination
>    worktree /home/ramsay/git/t/trash directory.t2028-worktree-move/elsewhere
>   +worktree /home/ramsay/git/t/trash directory.t2028-worktree-move/destination
>   not ok 12 - move worktree
>   #   
>   #           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
>   #           EOF
>   #           test_cmp expected actual &&
>   #           git -C destination log --format=%s >actual2 &&
>   #           echo init >expected2 &&
>   #           test_cmp expected2 actual2
>   #   
>   $ 
> 
> Is there an expectation that the submodules will be listed in

Er, that should read 'worktrees', of course! :(

ATB,
Ramsay Jones

Reply via email to