summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-27 14:13:15 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-27 14:13:59 -0700
commitd55aeb7687448189327ad058096b55431da5ea42 (patch)
treef49cf287c3a38b19db06547572a316ffd7fc923e
parent3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (diff)
downloadgit-jc/strbuf-add-lines-avoid-sp-ht-sequence.tar.gz
strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesjc/strbuf-add-lines-avoid-sp-ht-sequence
The strbuf_add_commented_lines() function passes a pair of prefixes, one to be used for a non-empty line, and the other for an empty line, to underlying add_lines(). The former is set to a comment char followed by a SP, while the latter is set to just the comment char. This is designed to give a SP after the comment character, e.g. "# <user text>\n", on a line with some text, and to avoid emitting an unsightly "# \n" for an empty line. Teach this machinery to also use the latter space-less prefix when the payload line begins with a tab, to show e.g. "#\t<user text>\n"; otherwise we will end up showing "# \t<user text>\n" which is similarly unsightly. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--strbuf.c3
-rwxr-xr-xt/t0030-stripspace.sh6
2 files changed, 8 insertions, 1 deletions
diff --git a/strbuf.c b/strbuf.c
index 33018d847f..a4486a9e49 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -222,7 +222,8 @@ static void add_lines(struct strbuf *out,
const char *next = memchr(buf, '\n', size);
next = next ? (next + 1) : (buf + size);
- prefix = (prefix2 && buf[0] == '\n') ? prefix2 : prefix1;
+ prefix = ((prefix2 && (buf[0] == '\n' || buf[0] == '\t'))
+ ? prefix2 : prefix1);
strbuf_addstr(out, prefix);
strbuf_add(out, buf, next - buf);
size -= next - buf;
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index 0333dd9875..29e91d861c 100755
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -432,4 +432,10 @@ test_expect_success '-c with changed comment char' '
test_cmp expect actual
'
+test_expect_success 'avoid SP-HT sequence in commented line' '
+ printf "#\tone\n#\n# two\n" >expect &&
+ printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
+ test_cmp expect actual
+'
+
test_done