Wrap long single-line comment messages.

[adns.git] / convert

diff --git a/convert b/convert
index 60b19980f597c7607261b4d9a8e85c0eb797eb4b..6c7278d4bda4d21dcb3fd563f484335b293b38ee 100755 (executable)
--- a/convert
+++ b/convert
@@ -43,7 +43,7 @@ graftmergein () {
        local branchname=branch-$desc
        mkdir -p .git/info
        local branchtip=`git rev-parse $branchname~0`
-       local oldparents=`git-log -n1 --pretty=format:%P $mergecommit`
+       local oldparents=`git log -n1 --pretty=format:%P $mergecommit`
        cat <<END >>.git/info/grafts
 $2 $oldparents $branchtip
 END
@@ -92,8 +92,15 @@ cat >$tmp/msg-filter <<'FEND'
 perl -ne '
                $out .= $_;
        END {
+               if ($out !~ /\n.*\n/) {
+                       $out = `fmt <<'\''EOF'\''
+$out
+EOF
+`;
+               }
                if ($out =~ m/^\@\@/s &&
-                   $out =~ m/^(?:\+ )?[^\@ ].*\w.*$/m) {
+                   ($out =~ m/^\+(?!u?adns).*\w.*$/m ||
+                    $out =~ m/^\-(?!u?adns).*\w.*$/m)) {
                        print $&, "\n\n" or die $!;
                }
                print $out or die $!;
@@ -102,11 +109,11 @@ perl -ne '
 FEND
 chmod +x $tmp/msg-filter
 
-git-filter-branch --msg-filter $tmp/msg-filter \
-       `git-show-ref | awk '{print $2}'`
+git filter-branch --msg-filter $tmp/msg-filter \
+       `git show-ref | awk '{print $2}'`
 
-git-show-ref | awk '{print $2}' | grep '^refs/original/' \
-       | xargs -n1 git-update-ref -d
+git show-ref | awk '{print $2}' | grep '^refs/original/' \
+       | xargs -n1 git update-ref -d
 
 rm -rf $tmp/converted
 mkdir $tmp/converted