From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Aug 2025 20:46:59 +0000 (-0700)
Subject: Merge branch 'jc/string-list-split'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=971ba42dd426f2531d5448488bcd3bd3282e6999;p=thirdparty%2Fgit.git

Merge branch 'jc/string-list-split'

string_list_split*() family of functions have been extended to
simplify common use cases.

* jc/string-list-split:
  string-list: split-then-remove-empty can be done while splitting
  string-list: optionally omit empty string pieces in string_list_split*()
  diff: simplify parsing of diff.colormovedws
  string-list: optionally trim string pieces split by string_list_split*()
  string-list: unify string_list_split* functions
  string-list: align string_list_split() with its _in_place() counterpart
  string-list: report programming error with BUG
---

971ba42dd426f2531d5448488bcd3bd3282e6999
diff --cc fetch-pack.c
index 46c39f85c4,9866270696..20e5533b21
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@@ -1913,8 -1913,8 +1913,8 @@@ static void fetch_pack_config(void
  	if (!uri_protocols.nr) {
  		char *str;
  
 -		if (!git_config_get_string("fetch.uriprotocols", &str) && str) {
 +		if (!repo_config_get_string(the_repository, "fetch.uriprotocols", &str) && str) {
- 			string_list_split(&uri_protocols, str, ',', -1);
+ 			string_list_split(&uri_protocols, str, ",", -1);
  			free(str);
  		}
  	}