* [PATCH] builtin/worktree.c: fix a sparse '0 as NULL pointer' warning
@ 2020-06-09 23:52 Ramsay Jones
2020-06-10 4:15 ` Eric Sunshine
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2020-06-09 23:52 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Junio C Hamano, GIT Mailing-list
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Eric,
If you need to re-roll your 'es/worktree-duplicate-paths' branch, could you
please squash this into the relevant patch (commit 71806ee9e8 (worktree: prune
linked worktree referencing main worktree path, 2020-06-08)).
Note that this is based on top of the 'pu' branch, and Junio has a fixup
patch (commit 4b01d684fe (SQUASH??? -Werror=main, 2020-06-08)) which also
changes this line of code (s/main/main_path/).
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 7762333228..2d8540bdae 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -199,7 +199,7 @@ static void prune_worktrees(void)
strbuf_add_absolute_path(&main_path, get_git_common_dir());
/* massage main worktree absolute path to match 'gitdir' content */
strbuf_strip_suffix(&main_path, "/.");
- string_list_append(&kept, strbuf_detach(&main_path, 0));
+ string_list_append(&kept, strbuf_detach(&main_path, NULL));
prune_dups(&kept);
string_list_clear(&kept, 1);
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] builtin/worktree.c: fix a sparse '0 as NULL pointer' warning
2020-06-09 23:52 [PATCH] builtin/worktree.c: fix a sparse '0 as NULL pointer' warning Ramsay Jones
@ 2020-06-10 4:15 ` Eric Sunshine
0 siblings, 0 replies; 2+ messages in thread
From: Eric Sunshine @ 2020-06-10 4:15 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
On Tue, Jun 9, 2020 at 7:53 PM Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:
> If you need to re-roll your 'es/worktree-duplicate-paths' branch, could you
> please squash this into the relevant patch (commit 71806ee9e8 (worktree: prune
> linked worktree referencing main worktree path, 2020-06-08)).
Thanks, I'll apply this change when I re-roll.
> Note that this is based on top of the 'pu' branch, and Junio has a fixup
> patch (commit 4b01d684fe (SQUASH??? -Werror=main, 2020-06-08)) which also
> changes this line of code (s/main/main_path/).
Indeed, I saw Junio's SQUASH and was planning on applying that, as well.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-10 4:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-09 23:52 [PATCH] builtin/worktree.c: fix a sparse '0 as NULL pointer' warning Ramsay Jones
2020-06-10 4:15 ` Eric Sunshine
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).