From: Moritz Neeb <lists@moritzneeb.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v4 0/7] replacing strbuf_getline_lf() by strbuf_getline()
Date: Mon, 29 Feb 2016 09:30:58 +0100 [thread overview]
Message-ID: <56D401C2.8020100@moritzneeb.de> (raw)
In-Reply-To: <56D28092.9090209@moritzneeb.de>
Although I was not sure [4], I decided to roll out v4, in the hope that the next
reviewers will profit by the more polished commit messages and order.
This series deals with strbuf_getline_lf() in certain codepaths:
Those, where the input that is read, is/was trimmed before doing anything that
could possibly expect a CR character. Those places can be assumed to be "text"
input, where a CR never would be a meaningful control character.
The purpose of this series is to document these places to have this property,
by using strbuf_getline() instead of strbuf_getline_lf(). Also in some codepaths,
the CR could be a leftover of an editor and is thus removed.
Every codepath was examined, if after the change it is still necessary to have
trimming or if the additional CRLF-removal suffices.
The series is an idea out of [1], where Junio proposed to replace the calls
to strbuf_getline_lf() because it 'would [be] a good way to document them as
dealing with "text"'.
Changes since v3 [3] (the changes to single patches are indicated below):
* Commit messages refined
* Order of patch 4 and 5 in v2 was switched.
The interdiff only removes an empty line (I noticed, when changing the order of
commits, that the splitting operation had no newline before this whole series,
so I left it that way):
diff --git a/builtin/notes.c b/builtin/notes.c
index 660c0b7..715fade 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -296,7 +296,6 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
int err;
string_list_split(&split, buf.buf, ' ', -1);
-
if (split.nr != 2)
die(_("Malformed input line: '%s'."), buf.buf);
if (get_sha1(split.items[0].string, from_obj))
-Moritz
[1], idea: http://thread.gmane.org/gmane.comp.version-control.git/284104
[2], v2: http://thread.gmane.org/gmane.comp.version-control.git/285118/focus=286865
[3], v3: http://thread.gmane.org/gmane.comp.version-control.git/285118/focus=287747
[4] http://thread.gmane.org/gmane.comp.version-control.git/285118/focus=287760
Moritz Neeb (7):
quote: remove leading space in sq_dequote_step -- as in v2
bisect: read bisect paths with strbuf_getline() -- refined commit message
clean: read user input with strbuf_getline() -- simplified commit message
notes copy --stdin: read lines with strbuf_getline() -- switched with below
notes copy --stdin: split lines with string_list_split() -- switched with above
remote: read $GIT_DIR/branches/* with strbuf_getline() -- as in v3
wt-status: read rebase todolist with strbuf_getline() -- as in v2
bisect.c | 5 ++---
builtin/clean.c | 6 +++---
builtin/notes.c | 22 ++++++++++------------
quote.c | 2 ++
remote.c | 2 +-
wt-status.c | 3 +--
6 files changed, 19 insertions(+), 21 deletions(-)
--
2.4.3
next prev parent reply other threads:[~2016-02-29 8:38 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-30 17:51 [PATCH 0/5] Replacing strbuf_getline_lf() by strbuf_getline() on trimmed input Moritz Neeb
2016-01-30 18:03 ` [PATCH 1/5] bisect: read bisect paths with strbuf_getline() Moritz Neeb
2016-02-01 21:30 ` Junio C Hamano
2016-02-14 21:01 ` Moritz Neeb
2016-02-15 5:05 ` Junio C Hamano
2016-02-21 23:48 ` Moritz Neeb
2016-02-22 0:07 ` Moritz Neeb
2016-01-30 18:04 ` [PATCH 2/5] clean: read user input " Moritz Neeb
2016-02-01 21:30 ` Junio C Hamano
2016-01-30 18:05 ` [PATCH 3/5] notes: read copied notes " Moritz Neeb
2016-02-01 21:34 ` Junio C Hamano
2016-01-30 18:05 ` [PATCH 4/5] remote: read $GIT_DIR/branches/* " Moritz Neeb
2016-01-30 18:05 ` [PATCH 5/5] wt-status: read rebase todolist " Moritz Neeb
2016-02-01 21:39 ` Junio C Hamano
2016-02-22 1:00 ` [PATCH v2 0/6] replacing strbuf_getline_lf() by strbuf_getline() on trimmed input Moritz Neeb
2016-02-22 1:15 ` [PATCH v2 1/6] quote: remove leading space in sq_dequote_step Moritz Neeb
2016-02-22 1:15 ` [PATCH v2 2/6] bisect: read bisect paths with strbuf_getline() Moritz Neeb
2016-02-22 1:16 ` [PATCH v2 4/6] notes: read copied notes " Moritz Neeb
2016-02-22 2:41 ` Eric Sunshine
2016-02-22 19:27 ` Junio C Hamano
2016-02-22 1:17 ` [PATCH v2 6/6] wt-status: read rebase todolist " Moritz Neeb
2016-02-22 19:30 ` Junio C Hamano
2016-02-22 1:20 ` [PATCH v2 3/6] clean: read user input " Moritz Neeb
2016-02-22 2:27 ` Eric Sunshine
2016-02-22 7:40 ` Moritz Neeb
2016-02-22 19:40 ` Junio C Hamano
2016-02-22 1:22 ` [PATCH v2 5/6] remote: read $GIT_DIR/branches/* " Moritz Neeb
2016-02-22 19:09 ` Junio C Hamano
2016-02-28 5:07 ` [PATCH v3 0/7] replacing strbuf_getline_lf() by strbuf_getline() Moritz Neeb
2016-02-28 5:13 ` [PATCH v3 1/7] quote: remove leading space in sq_dequote_step Moritz Neeb
2016-02-28 5:13 ` [PATCH v3 2/7] bisect: read bisect paths with strbuf_getline() Moritz Neeb
2016-02-28 6:33 ` Eric Sunshine
2016-02-28 7:30 ` Moritz Neeb
2016-02-28 5:13 ` [PATCH v3 3/7] clean: read user input " Moritz Neeb
2016-02-28 6:36 ` Eric Sunshine
2016-02-28 7:36 ` Moritz Neeb
2016-02-28 5:13 ` [PATCH v3 4/7] notes copy --stdin: split lines with string_list_split() Moritz Neeb
2016-02-28 6:56 ` Eric Sunshine
2016-02-28 7:47 ` Moritz Neeb
2016-02-28 16:02 ` Eric Sunshine
2016-02-28 5:13 ` [PATCH v3 5/7] notes copy --stdin: read lines with strbuf_getline() Moritz Neeb
2016-02-28 5:14 ` [PATCH v3 6/7] remote: read $GIT_DIR/branches/* " Moritz Neeb
2016-02-28 5:14 ` [PATCH v3 7/7] wt-status: read rebase todolist " Moritz Neeb
2016-02-28 6:30 ` [PATCH v3 0/7] replacing strbuf_getline_lf() by strbuf_getline() Eric Sunshine
2016-02-28 7:20 ` Moritz Neeb
2016-02-28 8:03 ` Moritz Neeb
2016-02-29 8:30 ` Moritz Neeb [this message]
2016-02-29 8:36 ` [PATCH v4 1/7] quote: remove leading space in sq_dequote_step Moritz Neeb
2016-02-29 19:01 ` Junio C Hamano
2016-02-29 21:45 ` Moritz Neeb
2016-02-29 21:48 ` Moritz Neeb
2016-02-29 8:36 ` [PATCH v4 2/7] bisect: read bisect paths with strbuf_getline() Moritz Neeb
2016-02-29 8:36 ` [PATCH v4 3/7] clean: read user input " Moritz Neeb
2016-02-29 8:36 ` [PATCH v4 5/7] notes copy --stdin: split lines with string_list_split() Moritz Neeb
2016-02-29 8:36 ` [PATCH v4 6/7] remote: read $GIT_DIR/branches/* with strbuf_getline() Moritz Neeb
2016-02-29 8:36 ` [PATCH v4 7/7] wt-status: read rebase todolist " Moritz Neeb
2016-02-29 8:36 ` [PATCH v4 4/7] notes copy --stdin: read lines " Moritz Neeb
2016-02-29 18:19 ` Eric Sunshine
2016-02-29 19:26 ` Moritz Neeb
2016-02-29 19:48 ` Eric Sunshine
2016-02-29 18:26 ` [PATCH v4 0/7] replacing strbuf_getline_lf() by strbuf_getline() Eric Sunshine
2016-03-09 0:25 ` Moritz Neeb
2016-03-09 0:39 ` Junio C Hamano
2016-03-09 1:13 ` Moritz Neeb
2016-03-09 20:28 ` Junio C Hamano
2016-03-09 1:17 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56D401C2.8020100@moritzneeb.de \
--to=lists@moritzneeb.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).