| commit | 02a8cfa478bcc5da72be549a2fbcae2f37bac1cd | |
| author | René Scharfe <l.s.r@web.de> | |
| Fri, 5 Aug 2016 21:01:35 +0000 (5 23:01 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Aug 2016 22:11:06 +0000 (5 15:11 -0700) | ||
| tree | 6355858d357481cf3b3065191dcc8ed671b6ce39 | treesnapshot (tar.gz zip) |
| parent | 08df31eeccfe1576971ea4ba42570a424c3cfc41 | commitdiff |
merge: use string_list_split() in add_strategies()
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 code didn't bother freeing any of the allocated memory.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 code didn't bother freeing any of the allocated memory.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |