# [PATCH] string_list: use the right kind of STRING_LIST_INIT 5 messages from 2022-07-21 to 2022-07-25. Participants: Junio C Hamano, Elijah Newren, Ævar Arnfjörð Bjarmason. Thread: https://gitlist.dev/t/58197 ## Junio C Hamano, 2022-07-21 01:02 Subject: [PATCH] string_list: use the right kind of STRING_LIST_INIT Message-ID: URL: https://gitlist.dev/e/xmqq7d471dns.fsf%40gitster.g ``` Since 4a4b4cda (builtin-remote: Make "remote -v" display push urls, 2009-06-13), the string_list that was initialized with 0 in its strdup_string member is immediately made to strdup its key strings by flipping the strdup_string member to true. When 183113a5 (string_list: Add STRING_LIST_INIT macro and make use of it., 2010-07-04) has introduced STRING_LIST_INIT macros, it mechanically replaced the initialization to STRING_LIST_INIT_NODUP. Instead, just use the other initialization macro to make it strdup the key from the beginning. Signed-off-by: Junio C Hamano --- builtin/remote.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git c/builtin/remote.c w/builtin/remote.c index d9b8746cb3..c713463d89 100644 --- c/builtin/remote.c +++ w/builtin/remote.c @@ -1229,10 +1229,9 @@ static int get_one_entry(struct remote *remote, void *priv) static int show_all(void) { - struct string_list list = STRING_LIST_INIT_NODUP; + struct string_list list = STRING_LIST_INIT_DUP; int result; - list.strdup_strings = 1; result = for_each_remote(get_one_entry, &list); if (!result) { ``` ## Elijah Newren, 2022-07-21 03:28 Subject: Re: [PATCH] string_list: use the right kind of STRING_LIST_INIT Message-ID: URL: https://gitlist.dev/e/CABPp-BFUoufmoQx8Oq%3D3C1ct-7paBs1fqzi8b8jhOadrndGkkg%40mail.gmail.com In-Reply-To: ``` On Wed, Jul 20, 2022 at 6:19 PM Junio C Hamano wrote: > > Since 4a4b4cda (builtin-remote: Make "remote -v" display push urls, > 2009-06-13), the string_list that was initialized with 0 in its > strdup_string member is immediately made to strdup its key strings > by flipping the strdup_string member to true. When 183113a5 > (string_list: Add STRING_LIST_INIT macro and make use of it., > 2010-07-04) has introduced STRING_LIST_INIT macros, it mechanically > replaced the initialization to STRING_LIST_INIT_NODUP. > > Instead, just use the other initialization macro to make it strdup > the key from the beginning. > > Signed-off-by: Junio C Hamano > --- > builtin/remote.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git c/builtin/remote.c w/builtin/remote.c > index d9b8746cb3..c713463d89 100644 > --- c/builtin/remote.c > +++ w/builtin/remote.c > @@ -1229,10 +1229,9 @@ static int get_one_entry(struct remote *remote, void *priv) > > static int show_all(void) > { > - struct string_list list = STRING_LIST_INIT_NODUP; > + struct string_list list = STRING_LIST_INIT_DUP; > int result; > > - list.strdup_strings = 1; > result = for_each_remote(get_one_entry, &list); > > if (!result) { Makes sense, but shouldn't the subject have s/string-list:/remote:/ ? ``` ## Junio C Hamano, 2022-07-21 04:45 Subject: Re: [PATCH] string_list: use the right kind of STRING_LIST_INIT Message-ID: URL: https://gitlist.dev/e/xmqqk087m5v1.fsf%40gitster.g In-Reply-To: ``` Elijah Newren writes: > Makes sense, but shouldn't the subject have s/string-list:/remote:/ ? Oh, you are absolutely right. I was influenced by 183113a5 (string_list: Add STRING_LIST_INIT macro and make use of it., 2010-07-04), which I was staring at too much while thinking that this fix was finishing up what it started. Will amend. Thanks. ``` ## Ævar Arnfjörð Bjarmason, 2022-07-21 05:55 Subject: Re: [PATCH] string_list: use the right kind of STRING_LIST_INIT Message-ID: <220721.868ronuhrm.gmgdl@evledraar.gmail.com> URL: https://gitlist.dev/e/220721.868ronuhrm.gmgdl%40evledraar.gmail.com In-Reply-To: ``` On Wed, Jul 20 2022, Junio C Hamano wrote: > Since 4a4b4cda (builtin-remote: Make "remote -v" display push urls, > 2009-06-13), the string_list that was initialized with 0 in its > strdup_string member is immediately made to strdup its key strings > by flipping the strdup_string member to true. When 183113a5 > (string_list: Add STRING_LIST_INIT macro and make use of it., > 2010-07-04) has introduced STRING_LIST_INIT macros, it mechanically > replaced the initialization to STRING_LIST_INIT_NODUP. > > Instead, just use the other initialization macro to make it strdup > the key from the beginning. > > Signed-off-by: Junio C Hamano > --- > builtin/remote.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git c/builtin/remote.c w/builtin/remote.c > index d9b8746cb3..c713463d89 100644 > --- c/builtin/remote.c > +++ w/builtin/remote.c > @@ -1229,10 +1229,9 @@ static int get_one_entry(struct remote *remote, void *priv) > > static int show_all(void) > { > - struct string_list list = STRING_LIST_INIT_NODUP; > + struct string_list list = STRING_LIST_INIT_DUP; > int result; > > - list.strdup_strings = 1; > result = for_each_remote(get_one_entry, &list); > > if (!result) { Heh :) I think it's safe to give this my Reviewed-By, since I've been running with this patch for almost a year now: https://github.com/avar/git/commit/bdf4466eb92 It's on a branch of some WIP string_list API fixes that I haven't sent in, but the fix looks good to me... ``` ## Junio C Hamano, 2022-07-25 19:01 Subject: Re: [PATCH] string_list: use the right kind of STRING_LIST_INIT Message-ID: URL: https://gitlist.dev/e/xmqqlesh3tla.fsf%40gitster.g In-Reply-To: <220721.868ronuhrm.gmgdl@evledraar.gmail.com> ``` Ævar Arnfjörð Bjarmason writes: > Heh :) I think it's safe to give this my Reviewed-By, since I've been > running with this patch for almost a year now: > https://github.com/avar/git/commit/bdf4466eb92 > > It's on a branch of some WIP string_list API fixes that I haven't sent > in, but the fix looks good to me... I do not think it is all that urgent, but I do not think it is worth wasting our braincells to remember that a WIP series is waiting to touch and update this area again, so I'll merge this single patch down to 'next' and 'master' soonish. Thanks. ```