Re: [PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning

[Duy Nguyen]

On Wed, Nov 16, 2016 at 3:28 AM, Ramsay Jones
 wrote:
>
> Signed-off-by: Ramsay Jones 
> ---
>
> 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)].

Will do, thanks (and it's also "thanks" for your other similar emails,
I just don't want to send a mail with just 'thanks' that adds nothing
else).

> 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 +
>   +++ actual2016-11-15 20:22:50.647241458 +
>   @@ -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' ?

I just sent a patch [1] to fix this before reading this mail. The
order so far has been determined by readdir() which is not great.

[1] 
https://public-inbox.org/git/CACsJy8DOT_4N_48UaoYK61G_8JUaXbEs7N=n24CH2q1GN=++5...@mail.gmail.com/T/#mfcf797219a1a143ed2ac45198015f19e82c70db2
-- 
Duy

Re: [PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning

[Ramsay Jones]

On 15/11/16 20:28, Ramsay Jones wrote:
> 
> Signed-off-by: Ramsay Jones 
> ---
> 
> 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
>   ...
>   --- expected2016-11-15 20:22:50.647241458 +
>   +++ actual  2016-11-15 20:22:50.647241458 +
>   @@ -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

[PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning

[Ramsay Jones]

Signed-off-by: Ramsay Jones 
---

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 +
  +++ actual2016-11-15 20:22:50.647241458 +
  @@ -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(, worktree_git_path(wt, "index")) > 0) {
-- 
2.10.0