src/: Support IPv6 reverse queries.

[adns.git] / convert

diff --git a/convert b/convert
index 7541ff12c258bc65ce3c53e71115103a09e4bd23..a0f4e8fa674d21c486c12682a04ed0d4ef75a0f6 100755 (executable)
--- a/convert
+++ b/convert
@@ -73,17 +73,24 @@ tochiark-1998-11-17
 fromchiark-1998-11-28
 END
 
-git checkout master
-scr=cvs-to-git-conversion-script
-cp $base/script/convert $scr
-git add $scr
-git commit -m "$scr: record the script
+(set -e
+ cd $base/script
+ if [ x"`git diff`" != x ]; then
+       git checkout master~0
+       git commit -a -m autocommit
+       git tag -f actual
+       git reset master
+       git checkout master
+ else
+       git tag -f actual
+ fi)
 
-Record the script we used to convert the CVS repo to git"
-git rm $scr
-git commit -m "$scr: delete the script
+git checkout master
+git fetch $base/script actual
+git merge -m 'CVS to git conversion
 
-We have in fact done the conversion and don't need the script any more."
+Record the scripts etc. we used (and their history) for posterity,
+by binding them into the history.' FETCH_HEAD
 
 git branch -d origin
 git tag cvs-to-git-conversion
@@ -92,6 +99,16 @@ cat >$tmp/msg-filter <<'FEND'
 perl -ne '
                $out .= $_;
        END {
+               if ($out =~ /\*\*\* empty log message/) {
+                       ($out = `git diff $ENV{GIT_COMMIT}^ $ENV{GIT_COMMIT} -- changelog`)
+                          =~ s/\A.*\n\@\@ /\@\@ /s;
+               }
+               if ($out !~ /\n.*\n/) {
+                       $out = `fmt <<'\''EOF'\''
+$out
+EOF
+`;
+               }
                if ($out =~ m/^\@\@/s &&
                    ($out =~ m/^\+(?!u?adns).*\w.*$/m ||
                     $out =~ m/^\-(?!u?adns).*\w.*$/m)) {