Merge branch 'maint-1.7.6' into maint-1.7.7

gitster · gitster · commit c34ba9967c0c · 2011-12-05T15:07:49.000-08:00
* maint-1.7.6:
  stripspace: fix outdated comment
  Add MYMETA.yml to perl/.gitignore
diff --git 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
@@ -1,5 +1,6 @@
 perl.mak
 perl.mak.old
+MYMETA.yml
 blib
 blibdirs
 pm_to_blib

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ static size_t cleanup(char *line, size_t len)`
`22`	`22`	`* Remove empty lines from the beginning and end`
`23`	`23`	`* and also trailing spaces from every line.`
`24`	`24`	`*`
`25`		`- * Note that the buffer will not be NUL-terminated.`
`26`		`- *`
`27`	`25`	`* Turn multiple consecutive empty lines between paragraphs`
`28`	`26`	`* into just one empty line.`
`29`	`27`	`*`