From: DOAN Tran Cong Danh <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: animi.vulpis@gmail.com, j6t@kdbg.org, peff@peff.net,
gitster@pobox.com, git@grubix.eu, pclouds@gmail.com,
karthik.188@gmail.com, DOAN Tran Cong Danh <congdanhqx@gmail.com>
Subject: [PATCH] ref-filter: treat CRLF as same as LF in find_subpos
Date: Sun, 21 May 2017 22:10:59 +0800 [thread overview]
Message-ID: <20170521141059.2767-1-congdanhqx@gmail.com> (raw)
In-Reply-To: <CALKRkrxHNao6NY+-_UmznHdq29yVJJynu8Xx5M__YfK9UkdOAw@mail.gmail.com>
Starting from commit 949af06 (branch: use ref-filter printing APIs, 2017-01-10),
`git branch -v` doesn't treat CRLF as line separator anymore.
Quote from git mailing-list:
> Here is a recipe to reproduce the error:
>
> git init
> git commit --allow-empty -m initial
> git branch crlf $(printf '%s\r\n' subject '' line3_long line4 |
> git commit-tree HEAD:)
> The reason for the "bug" is obviously that a line having CR in addition
> to LF is not "an empty line". Consequently, the second line is not
> treated as a separator between subject and body, whereupon Git
> concatenates all line into one large subject line. This strips the LFs
> but leaves the CRS in tact, which, when printed on a terminal move the
> cursor to the beginning of the line, so that text after the CRs
> overwrites what is already in the terminal.
Reported-by: Animi Vulpis <animi.vulpis@gmail.com>
Helped-by: Johannes Sixt <j6t@kbdg.org>
Signed-off-by: DOAN Tran Cong Danh <congdanhqx@gmail.com>
---
ref-filter.c | 19 +++++++++++++++----
t/t3203-branch-output.sh | 3 ++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 1fc5e9970..b3c2276a5 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -967,7 +967,8 @@ static void find_subpos(const char *buf, unsigned long sz,
/* subject is first non-empty line */
*sub = buf;
/* subject goes to first empty line */
- while (buf < *sig && *buf && *buf != '\n') {
+ while (buf < *sig && *buf && *buf != '\n'
+ && !(*buf == '\r' && *(buf + 1) == '\n')) {
eol = strchrnul(buf, '\n');
if (*eol)
eol++;
@@ -975,12 +976,22 @@ static void find_subpos(const char *buf, unsigned long sz,
}
*sublen = buf - *sub;
/* drop trailing newline, if present */
- if (*sublen && (*sub)[*sublen - 1] == '\n')
+ if (*sublen && (*sub)[*sublen - 1] == '\n') {
*sublen -= 1;
+ /* also drop trailing CR before that LF */
+ if ((*sublen) && (*sub)[*sublen - 1] == '\r')
+ *sublen -= 1;
+ }
/* skip any empty lines */
- while (*buf == '\n')
- buf++;
+ while (1) {
+ if (*buf == '\n')
+ buf++;
+ else if (*buf == '\r' && *(buf + 1) == '\n')
+ buf += 2;
+ else
+ break;
+ }
*body = buf;
*bodylen = strlen(buf);
*nonsiglen = *sig - buf;
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 5778c0afe..29b392066 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -13,7 +13,8 @@ test_expect_success 'make commits' '
test_expect_success 'make branches' '
git branch branch-one &&
- git branch branch-two HEAD^
+ git branch branch-two $(printf "%s\r\n" one "" line3_long line4 |
+ git commit-tree HEAD:)
'
test_expect_success 'make remote branches' '
--
2.13.0.67.g10c78a1
next prev parent reply other threads:[~2017-05-21 14:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 23:22 [Bug] git branch -v has problems with carriage returns Animi Vulpis
[not found] ` <CA+izobutP-JY84RGG-JbPA5twbckL1uVwxknBRLVTuGG0MEJcg@mail.gmail.com>
[not found] ` <CA+izobuSKtoQzNJuvuisjh7h3FF=nbt8u-hOHfdeFp8ZjgZF+Q@mail.gmail.com>
[not found] ` <591f6844.82dcca0a.451e5.8f76.GMRIR@mx.google.com>
2017-05-19 21:51 ` Delivery Status Notification (Failure) Atousa Duprat
2017-05-19 21:55 ` [Bug] git branch -v has problems with carriage returns Atousa Duprat
2017-05-19 23:20 ` Animi Vulpis
2017-05-20 6:48 ` Johannes Sixt
2017-05-31 5:32 ` Atousa Duprat
2017-05-31 20:58 ` Stefan Beller
2017-06-01 1:31 ` Junio C Hamano
2017-05-21 13:42 ` [PATCH] ref-filter: treat CRLF as same as LF in find_subpos DOAN Tran Cong Danh
2017-05-22 1:19 ` Junio C Hamano
2017-05-22 11:29 ` DOAN Tran Cong Danh
2017-05-22 20:12 ` Jeff King
2017-05-23 1:49 ` Junio C Hamano
2017-05-23 2:01 ` Junio C Hamano
2017-05-23 3:01 ` Junio C Hamano
2017-05-21 14:10 ` DOAN Tran Cong Danh [this message]
2017-05-22 14:57 ` [PATCH v2] ref-filter: trim end whitespace in subject DOAN Tran Cong Danh
2017-05-22 17:10 ` [PATCH v3] " DOAN Tran Cong Danh
2017-05-22 19:47 ` Johannes Sixt
2017-05-22 19:53 ` Jeff King
2017-05-22 20:19 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170521141059.2767-1-congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=animi.vulpis@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=karthik.188@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).