From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning
Date: Tue, 15 Nov 2016 20:28:47 +0000 [thread overview]
Message-ID: <5b7d7d0b-8a6c-d516-4eb9-4e4ea13dce73@ramsayjones.plus.com> (raw)
Signed-off-by: Ramsay Jones <ramsay@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
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
next reply other threads:[~2016-11-15 20:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-15 20:28 Ramsay Jones [this message]
2016-11-15 20:50 ` [PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning Ramsay Jones
2016-11-16 13:17 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5b7d7d0b-8a6c-d516-4eb9-4e4ea13dce73@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox