From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 May 2014 16:02:07 +0000 (+0100)
Subject: merge the script's history into the generated history
X-Git-Tag: cvs-to-git-conversion^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=4631609f16aa83929a17af7937c17f62eb8a1157;hp=194b32e42f9d2a9555b920defef6fffae792e008

merge the script's history into the generated history
---

diff --git a/convert b/convert
index 78d4ac3..91f62d2 100755
--- a/convert
+++ b/convert
@@ -73,17 +73,22 @@ 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
+ 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