Signed-off-by: Ramsay Jones <[email protected]>
---
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
any particular order by 'git worktree list --porcelain' ?
Thanks!
ATB,
Ramsay Jones
builtin/worktree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index e738142..abdf462 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -526,7 +526,7 @@ static int unlock_worktree(int ac, const char **av, const
char *prefix)
static void validate_no_submodules(const struct worktree *wt)
{
- struct index_state istate = {0};
+ struct index_state istate = { NULL };
int i, found_submodules = 0;
if (read_index_from(&istate, worktree_git_path(wt, "index")) > 0) {
--
2.10.0
