summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 23:08:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-05 23:08:20 (GMT)
commit9a6e2d77e91af34ebc6679ba3250524504083284 (patch)
tree25dc9642dba21131b9dd6f325e6f926458565375
parent7c766e57e8214ee3cef6e215eaf8e2b3b56767e3 (diff)
parentb1af9630d758e1728fc0008b3f18d90d8f87f4c5 (diff)
downloadgit-9a6e2d77e91af34ebc6679ba3250524504083284.zip
git-9a6e2d77e91af34ebc6679ba3250524504083284.tar.gz
git-9a6e2d77e91af34ebc6679ba3250524504083284.tar.bz2
Merge branch 'maint'
* maint: stripspace: fix outdated comment Add MYMETA.yml to perl/.gitignore
-rw-r--r--builtin/stripspace.c2
-rw-r--r--perl/.gitignore1
2 files changed, 1 insertions, 2 deletions
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 4d3b93f..1288ffc 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -22,8 +22,6 @@ static size_t cleanup(char *line, size_t len)
* Remove empty lines from the beginning and end
* and also trailing spaces from every line.
*
- * Note that the buffer will not be NUL-terminated.
- *
* Turn multiple consecutive empty lines between paragraphs
* into just one empty line.
*
diff --git a/perl/.gitignore b/perl/.gitignore
index 98b2477..9235e73 100644
--- a/perl/.gitignore
+++ b/perl/.gitignore
@@ -1,5 +1,6 @@
perl.mak
perl.mak.old
+MYMETA.yml
blib
blibdirs
pm_to_blib