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

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/var.c
Simple merge

diff --cc connect.c
Simple merge

diff --cc fetch-pack.c
index 46c39f85c4ca9e5adfb5b5882ef8ab98326abd07,98662706968dba72ed87a6c4708ea80855a6be3c..20e5533b21854232cddeacbbfd85cc9cfc5d1c1d
--- 1/fetch-pack.c
--- 2/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);
                }
        }

diff --cc notes.c
Simple merge

diff --cc protocol.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc t/helper/test-hashmap.c
Simple merge

diff --cc t/helper/test-ref-store.c
Simple merge

diff --cc transport.c
Simple merge