diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-28 16:10:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-28 16:10:14 -0800 |
| commit | b62624b51a54325e6884c197352dc0dcef700325 (patch) | |
| tree | 2a5c68bae2133bbb762253f183abcc6f00f8faef /builtin/notes.c | |
| parent | 116a866bf50da9b893623ebb940e1c6bff7a29bc (diff) | |
| parent | 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (diff) | |
| download | git-b62624b51a54325e6884c197352dc0dcef700325.tar.gz | |
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/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index e1556896f9..9d54934d6c 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -290,7 +290,7 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd) t = &default_notes_tree; } - while (strbuf_getline(&buf, stdin, '\n') != EOF) { + while (strbuf_getline_lf(&buf, stdin) != EOF) { unsigned char from_obj[20], to_obj[20]; struct strbuf **split; int err; |