diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 21:49:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 21:49:19 +0100 |
| commit | 58e0362eddba1678a71c8990862053ff989527b6 (patch) | |
| tree | 3d3a41a516dc7cc1343c5f71f212eb79f1662632 /t | |
| parent | Merge branch 'jc/diff-b-m' (diff) | |
| parent | strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines (diff) | |
| download | git-58e0362eddba1678a71c8990862053ff989527b6.tar.xz git-58e0362eddba1678a71c8990862053ff989527b6.zip | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0030-stripspace.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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 |