mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
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
This commit is contained in:
@@ -435,7 +435,7 @@ static int remote_ref_atom_parser(struct ref_format *format UNUSED,
|
||||
}
|
||||
|
||||
atom->u.remote_ref.nobracket = 0;
|
||||
string_list_split(¶ms, arg, ',', -1);
|
||||
string_list_split(¶ms, arg, ",", -1);
|
||||
|
||||
for (i = 0; i < params.nr; i++) {
|
||||
const char *s = params.items[i].string;
|
||||
@@ -831,7 +831,7 @@ static int align_atom_parser(struct ref_format *format UNUSED,
|
||||
|
||||
align->position = ALIGN_LEFT;
|
||||
|
||||
string_list_split(¶ms, arg, ',', -1);
|
||||
string_list_split(¶ms, arg, ",", -1);
|
||||
for (i = 0; i < params.nr; i++) {
|
||||
const char *s = params.items[i].string;
|
||||
int position;
|
||||
|
||||
Reference in New Issue
Block a user