diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-01-29 00:10:14 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-01-29 00:10:14 (GMT) |
commit | b62624b51a54325e6884c197352dc0dcef700325 (patch) | |
tree | 2a5c68bae2133bbb762253f183abcc6f00f8faef /builtin/hash-object.c | |
parent | 116a866bf50da9b893623ebb940e1c6bff7a29bc (diff) | |
parent | 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (diff) | |
download | git-b62624b51a54325e6884c197352dc0dcef700325.zip git-b62624b51a54325e6884c197352dc0dcef700325.tar.gz git-b62624b51a54325e6884c197352dc0dcef700325.tar.bz2 |
Merge branch 'jc/strbuf-getline'
The preliminary clean-up for jc/peace-with-crlf topic.
* jc/strbuf-getline:
strbuf: give strbuf_getline() to the "most text friendly" variant
checkout-index: there are only two possible line terminations
update-index: there are only two possible line terminations
check-ignore: there are only two possible line terminations
check-attr: there are only two possible line terminations
mktree: there are only two possible line terminations
strbuf: introduce strbuf_getline_{lf,nul}()
strbuf: make strbuf_getline_crlf() global
strbuf: miniscule style fix
Diffstat (limited to 'builtin/hash-object.c')
-rw-r--r-- | builtin/hash-object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 43b098b..3bc5ec1 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -60,7 +60,7 @@ static void hash_stdin_paths(const char *type, int no_filters, unsigned flags, { struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT; - while (strbuf_getline(&buf, stdin, '\n') != EOF) { + while (strbuf_getline_lf(&buf, stdin) != EOF) { if (buf.buf[0] == '"') { strbuf_reset(&nbuf); if (unquote_c_style(&nbuf, buf.buf, NULL)) |