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 /builtin/merge.c | |
| parent | 5a404a70c789707225d5c402510dd3d2e777f43a (diff) | |
| parent | 2ab2aac73d234ae75096e2186b07cc14c57d2586 (diff) | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index ce880e6ccb..c3810c9cb2 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -875,7 +875,7 @@ static void add_strategies(const char *string, unsigned attr) if (string) { struct string_list list = STRING_LIST_INIT_DUP; struct string_list_item *item; - string_list_split(&list, string, ' ', -1); + string_list_split(&list, string, " ", -1); for_each_string_list_item(item, &list) append_strategy(get_strategy(item->string)); string_list_clear(&list, 0); |