diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-28 14:05:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-14 14:30:41 -0800 |
| commit | 21e78c985fce5fa8431b47c5714c067e9169374b (patch) | |
| tree | 3e75981b3bfbb70b0a9f6edd4b4b0faa14132a03 | |
| parent | 0fc3646f9cfbb64c1dc7b1bcaf97cb4b1ba51db2 (diff) | |
| download | git-21e78c985fce5fa8431b47c5714c067e9169374b.tar.gz | |
revision: read --stdin with strbuf_getline()
Reading with getwholeline() and manually stripping the terminating
'\n' would leave CR at the end of the line if the input comes from
a DOS editor.
Constrasting this with the previous few changes, one may realize
that the way "log" family of commands read the paths with --stdin
looks inconsistent and sloppy. It does not allow us to C-quote a
textual input, and it does not accept NUL-terminated records. These
are unfortunately way too late to fix X-<.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/revision.c b/revision.c index 22364636d1..a3cc416940 100644 --- a/revision.c +++ b/revision.c @@ -1641,10 +1641,7 @@ static void append_prune_data(struct cmdline_pathspec *prune, const char **av) static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb, struct cmdline_pathspec *prune) { - while (strbuf_getwholeline(sb, stdin, '\n') != EOF) { - int len = sb->len; - if (len && sb->buf[len - 1] == '\n') - sb->buf[--len] = '\0'; + while (strbuf_getline(sb, stdin) != EOF) { ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc); prune->path[prune->nr++] = xstrdup(sb->buf); } @@ -1661,10 +1658,8 @@ static void read_revisions_from_stdin(struct rev_info *revs, warn_on_object_refname_ambiguity = 0; strbuf_init(&sb, 1000); - while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) { + while (strbuf_getline(&sb, stdin) != EOF) { int len = sb.len; - if (len && sb.buf[len - 1] == '\n') - sb.buf[--len] = '\0'; if (!len) break; if (sb.buf[0] == '-') { |