Re: [PATCH] merge: use string_list_split() in add_strategies()

2016-08-10 Thread Junio C Hamano
Johannes Schindelin writes: > All true, but I guess this type of complexity would really complexify > René's patch too much, so I am comfortable with the patch as-is. Yeah, good that we reached the same conclusion, as my point was that for_each_word() would not be

Re: [PATCH] merge: use string_list_split() in add_strategies()

2016-08-10 Thread Johannes Schindelin
Hi Junio, On Mon, 8 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > I wonder, however, if we could somhow turn things around by > > introducing something like > > > > split_and_do_for_each(item_p, length, string, delimiter) > >

Re: [PATCH] merge: use string_list_split() in add_strategies()

2016-08-08 Thread Junio C Hamano
Junio C Hamano writes: > If the input comes from the end user, we certainly would want to > allow "word1 word2\tword3 " as input (i.e. squishing repeated Any intelligent reader may have guessed already, but before I stupidly told Emacs to refill the paragraph, the above

Re: [PATCH] merge: use string_list_split() in add_strategies()

2016-08-08 Thread Junio C Hamano
Johannes Schindelin writes: > I wonder, however, if we could somhow turn things around by introducing > something like > > split_and_do_for_each(item_p, length, string, delimiter) > ... ... > > that both string_list_split() *and* add_strategies()

Re: [PATCH] merge: use string_list_split() in add_strategies()

2016-08-08 Thread Johannes Schindelin
Hi René, On Fri, 5 Aug 2016, René Scharfe wrote: > static void add_strategies(const char *string, unsigned attr) > { > - struct strategy *list = NULL; > - int list_alloc = 0, list_nr = 0, i; > - > - memset(, 0, sizeof(list)); > - split_merge_strategies(string, , _nr, _alloc); >

[PATCH] merge: use string_list_split() in add_strategies()

2016-08-05 Thread René Scharfe
Call string_list_split() for cutting a space separated list into pieces instead of reimplementing it based on struct strategy. The attr member of struct strategy was not used split_merge_strategies(); it was a pure string operation. Also be nice and clean up once we're done splitting; the old