From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2011 23:07:49 +0000 (-0800)
Subject: Merge branch 'maint-1.7.6' into maint-1.7.7
X-Git-Tag: v1.7.7.5~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c34ba9967c0cf882bbdaf87bd72fa84e0ef099ed?hp=1e501a7c47ad5ada53d3b1acfb9f131f76e969ec

Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
stripspace: fix outdated comment
Add MYMETA.yml to perl/.gitignore
---

diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 4d3b93fedb..1288ffcc52 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 98b24772c7..9235e73163 100644
--- a/perl/.gitignore
+++ b/perl/.gitignore
@@ -1,5 +1,6 @@
 perl.mak
 perl.mak.old
+MYMETA.yml
 blib
 blibdirs
 pm_to_blib