Continued from http://thread.gmane.org/gmane.comp.version-control.git/282614 Here is only the preparatory part that - introduces strbuf_getline_lf() and strbuf_getine_nul() and converts existing callers to strbut_getline() to use them; - retires strbuf_getline() that takes an arbitrary line terminator and demotes it to strbuf_getdelim() that is merely an implementation detail inside strbuf.c; and - gives the short-and-sweet name strbuf_getline() to the most "text friendly" strbuf_getline_crlf(). I am sending this out as preview now before implementing the main part of the series that audits callers of strbuf_getline_lf() and selectively turns them into strbuf_getline(). The work I did for v2 that corresponds to that main part will have to be redone because of the changes to function names made by these preparatory steps, and it would be rather boring mechanical and time-consuming work that is prone to stupid mistakes, which I do not want to start late in the day. Junio C Hamano (9): strbuf: miniscule style fix strbuf: make strbuf_getline_crlf() global strbuf: introduce strbuf_getline_{lf,nul}() mktree: there are only two line terminators check-attr: there are only two line terminators check-ignore: there are only two line terminators update-index: there are only two line terminators checkout-index: there are only two line terminators strbuf: give strbuf_getline() to the "most text friendly" variant bisect.c | 8 ++++---- builtin/am.c | 37 +++++++++++-------------------------- builtin/cat-file.c | 2 +- builtin/check-attr.c | 7 ++++--- builtin/check-ignore.c | 7 ++++--- builtin/check-mailmap.c | 2 +- builtin/checkout-index.c | 10 +++++++--- builtin/clean.c | 6 +++--- builtin/clone.c | 2 +- builtin/column.c | 2 +- builtin/commit.c | 2 +- builtin/fetch-pack.c | 2 +- builtin/grep.c | 2 +- builtin/hash-object.c | 2 +- builtin/mailinfo.c | 8 ++++---- builtin/mktree.c | 14 ++++++++------ builtin/notes.c | 2 +- builtin/pull.c | 2 +- builtin/repack.c | 2 +- builtin/rev-parse.c | 4 ++-- builtin/send-pack.c | 2 +- builtin/update-index.c | 27 ++++++++++++++++----------- compat/terminal.c | 2 +- credential-cache--daemon.c | 4 ++-- credential-store.c | 2 +- credential.c | 2 +- daemon.c | 2 +- fast-import.c | 4 ++-- ident.c | 2 +- remote-curl.c | 6 +++--- remote-testsvn.c | 4 ++-- remote.c | 4 ++-- sequencer.c | 2 +- sha1_file.c | 2 +- shell.c | 2 +- strbuf.c | 28 +++++++++++++++++++++++++--- strbuf.h | 27 ++++++++++++++++++++++----- test-sha1-array.c | 2 +- transport-helper.c | 5 +++-- walker.c | 2 +- wt-status.c | 4 ++-- 41 files changed, 148 insertions(+), 110 deletions(-) -- 2.7.0-242-gdd583c7 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html