If it is fed a commit with more than one leading blank lines,
the sed scripts git-format-patch-script used looped forever.
This patch fixes it.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
git-format-patch-script | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
58a3c79b488a28897cd5556dab0dd599b4ed9f0c
diff --git a/git-format-patch-script b/git-format-patch-script
--- a/git-format-patch-script
+++ b/git-format-patch-script
@@ -66,9 +66,13 @@ trap 'rm -f $tmp-*' 0 1 2 3 15
series=$tmp-series
titleScript='
- 1,/^$/d
+ /./d
: loop
- /^$/b loop
+ /^$/{
+ n
+ b loop
+ }
+ s/^\[PATCH[^]]*\] *//
s/[^-a-z.A-Z_0-9]/-/g
s/\.\.\.*/\./g
s/\.*$//
@@ -76,6 +80,7 @@ titleScript='
s/^-//
s/-$//
s/$/./
+ p
q
'
@@ -88,7 +93,7 @@ total=`wc -l <$series`
i=$total
while read commit
do
- title=`git-cat-file commit "$commit" | sed -e "$titleScript"`
+ title=`git-cat-file commit "$commit" | sed -ne "$titleScript"`
case "$numbered" in
'') num= ;;
*)
@@ -102,9 +107,12 @@ do
echo "$file"
{
mailScript='
- 1,/^$/d
+ /./d
: loop
- /^$/b loop
+ /^$/{
+ n
+ b loop
+ }
s|^|[PATCH'"$num"'] |
: body
p
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
