All of lore.kernel.org
 help / color / mirror / Atom feed
From: Moritz Neeb <lists@moritzneeb.de>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH 5/5] wt-status: read rebase todolist with strbuf_getline()
Date: Sat, 30 Jan 2016 19:05:47 +0100	[thread overview]
Message-ID: <56ACFB7B.6050800@moritzneeb.de> (raw)
In-Reply-To: <56ACF82B.2030005@moritzneeb.de>

    In read_rebase_todolist() every line is, after reading, checked
    for a comment_line_char. After that it is trimmed via strbuf_trim().
    Assuming we do never expect a CR as comment_line_char,
    strbuf_getline_lf() can be safely replaced by its CRLF counterpart.

Signed-off-by: Moritz Neeb <lists@moritzneeb.de>
---

Notes:
    Looking at the code in read_rebase_todolist(), the
    lines are read, checked for a comment_line_char and then trimmed. I
    wonder why the input is not trimmed before checking for this character?
    Is it safe to replace strbuf_getline_lf() by strbuf_getline() anyway?
        The only case I can imagine that could lead to unexpected behaviour then
    would be when someone sets the comment_line_char to CR. How likely is that?
        Why is the trim _after_ checking for the comment char anyway? Should
    something like "   # foobar" not be considered as comment?
        I decided to roll out the patch because I considered it not as a risk to be
    taken seriously, that the comment line char will be '\r'.
        Meta-question: Should something of this discussion be put into the commit?

 wt-status.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wt-status.c b/wt-status.c
index ab4f80d..f053b2f 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1076,7 +1076,7 @@ static void read_rebase_todolist(const char *fname, struct string_list *lines)
 	if (!f)
 		die_errno("Could not open file %s for reading",
 			  git_path("%s", fname));
-	while (!strbuf_getline_lf(&line, f)) {
+	while (!strbuf_getline(&line, f)) {
 		if (line.len && line.buf[0] == comment_line_char)
 			continue;
 		strbuf_trim(&line);
-- 
2.4.3

  parent reply	other threads:[~2016-01-30 18:06 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 ` Moritz Neeb [this message]
2016-02-01 21:39   ` [PATCH 5/5] wt-status: read rebase todolist " 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     ` [PATCH v4 " Moritz Neeb
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=56ACFB7B.6050800@moritzneeb.de \
    --to=lists@moritzneeb.de \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.