diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:46:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:46:59 -0700 |
| commit | 971ba42dd426f2531d5448488bcd3bd3282e6999 (patch) | |
| tree | 90b087657b1dfcc37763734ad7b749e13bd2cab3 /setup.c | |
| parent | 5a404a70c789707225d5c402510dd3d2e777f43a (diff) | |
| parent | 2ab2aac73d234ae75096e2186b07cc14c57d2586 (diff) | |
| download | git-971ba42dd426f2531d5448488bcd3bd3282e6999.tar.gz | |
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
Diffstat (limited to 'setup.c')
| -rw-r--r-- | setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1460,8 +1460,9 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir, if (env_ceiling_dirs) { int empty_entry_found = 0; + static const char path_sep[] = { PATH_SEP, '\0' }; - string_list_split(&ceiling_dirs, env_ceiling_dirs, PATH_SEP, -1); + string_list_split(&ceiling_dirs, env_ceiling_dirs, path_sep, -1); filter_string_list(&ceiling_dirs, 0, canonicalize_ceiling_entry, &empty_entry_found); ceil_offset = longest_ancestor_length(dir->buf, &ceiling_dirs); |