X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=convert;h=a0f4e8fa674d21c486c12682a04ed0d4ef75a0f6;hp=6c7278d4bda4d21dcb3fd563f484335b293b38ee;hb=898afc783a7bd5947405b4fd828a34dfbd9b99a8;hpb=f1ec69ced69f349c300d71b62a75d5829b6ac2e0

diff --git a/convert b/convert
index 6c7278d..a0f4e8f 100755
--- 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,10 @@ 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