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 /fast-import.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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c index 3c65edb5c4..bf01b34221 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1888,7 +1888,7 @@ static int read_next_command(void) struct recent_command *rc; strbuf_detach(&command_buf, NULL); - stdin_eof = strbuf_getline(&command_buf, stdin, '\n'); + stdin_eof = strbuf_getline_lf(&command_buf, stdin); if (stdin_eof) return EOF; @@ -1960,7 +1960,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) strbuf_detach(&command_buf, NULL); for (;;) { - if (strbuf_getline(&command_buf, stdin, '\n') == EOF) + if (strbuf_getline_lf(&command_buf, stdin) == EOF) die("EOF in data (terminator '%s' not found)", term); if (term_len == command_buf.len && !strcmp(term, command_buf.buf)) |