[PATCH] fetch: fix compilation warning

Ramsay Jones· Sep 27, 2018, 22:08 UTC · lore

commit 440fc7c0729 ("fetch: replace string-list used as a look-up table with a hashmap", 2018-09-25) renamed a string-list variable (while adding a hashmap of the same name) and forgot to rename the string-list variable in a call to string_list_clear().

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Junio,

You probably already know, but I had to add this on top of the 'pu' branch to get a clean compile tonight (your 'jc/war-on-string-list' branch).

Thanks!

ATB, Ramsay Jones

 builtin/fetch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to builtin/fetch.c +1 −1

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 0a71953bc5..aea2e10364 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -391,7 +391,7 @@ static void find_non_local_tags(const struct ref *refs,
 		}
 	}
 	hashmap_free(&remote_refs, 1);
-	string_list_clear(&remote_refs, 0);
+	string_list_clear(&remote_refs_list, 0);
 }
 
 static struct ref *get_ref_map(struct remote *remote,

-- 
2.19.0

Junio C Hamano· Sep 29, 2018, 18:34 UTC · re: Ramsay Jones · lore

Re: [PATCH] fetch: fix compilation warning

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

> You probably already know, but I had to add this on top of the 'pu'
> branch to get a clean compile tonight (your 'jc/war-on-string-list'
> branch).

It was not just about squelching a warning but simply broken code that deserved to be warned/errored. I think what we have in 'pu' now is already fixed.

Thanks.

Show 7 quoted lines

>  	}
>  	hashmap_free(&remote_refs, 1);
> -	string_list_clear(&remote_refs, 0);
> +	string_list_clear(&remote_refs_list, 0);
>  }
>  
>  static struct ref *get_ref_map(struct remote *remote,

patchfetch: fix compilation warning