diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:49:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:49:19 -0800 |
| commit | 58e0362eddba1678a71c8990862053ff989527b6 (patch) | |
| tree | 3d3a41a516dc7cc1343c5f71f212eb79f1662632 | |
| parent | f41157e649615ada01f175d00f9bd8c9ea507bca (diff) | |
| parent | d55aeb7687448189327ad058096b55431da5ea42 (diff) | |
| download | git-58e0362eddba1678a71c8990862053ff989527b6.tar.gz | |
Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
The commented output used to blindly add a SP before the payload
line, resulting in "# \t<indented text>\n" when the payload began
with a HT. Instead, produce "#\t<indented text>\n".
* jc/strbuf-add-lines-avoid-sp-ht-sequence:
strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines
| -rw-r--r-- | strbuf.c | 3 | ||||
| -rwxr-xr-x | t/t0030-stripspace.sh | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -229,7 +229,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 |