3 base=$HOME/things/Adns/Cvs-Convert
9 if ! test -d $tmp/git-cvsi; then
12 git cvsimport -d `pwd`/cvs-repo -C tmp/git-cvsi.new -k -p --norc adns
13 mv tmp/git-cvsi.new tmp/git-cvsi
17 rsync -aH --delete git-cvsi/. adjust
21 local oldbranchname=$1
23 git tag $newtagname $oldbranchname
24 git branch -D $oldbranchname
28 # these two together unconditionally delete the tag if it exists
29 git tag -f $tagname master
32 abandondatedbranch () {
36 if [ "x$newdesc" = x ]; then newdesc=$olddesc; fi
37 abandonbranch branch-$date-$olddesc abandon.$date.$newdesc
38 ensurenotag branchpoint-$date-$olddesc master
41 abandonbranch branch-rrtypenoenum abandon.1998-10-04.rrtypenoenum
42 abandondatedbranch 1999-04-10 mthread multithread
43 abandondatedbranch 1999-04-11 ipv6
44 abandondatedbranch 1999-04-11 pollfds
46 abandondatedbranch 2000-05-07 ipv6
47 abandonbranch branch-0-7-inftodebug abandon.2000-03-26.infotodebug-0.7
52 local branchname=branch-$desc
54 local branchtip=`git rev-parse $branchname~0`
55 local oldparents=`git-log -n1 --pretty=format:%P $mergecommit`
56 cat <<END >>.git/info/grafts
57 $2 $oldparents $branchtip
59 git branch -D $branchname
60 ensurenotag mergepoint-$desc
61 ensurenotag branchpoint-$desc
64 graftmergein logcallbackfn 741a795cdaa539b48f83afbc0ac8e471543b9bf6
65 graftmergein 1999-05-09-gplvslgpl e7cf3a99e5829bf53a9f36e08769787a78261045
67 xargs git tag -d <<END
78 scr=cvs-to-git-conversion-script
81 git commit -m "$scr: record the script
83 Record the script we used to convert the CVS repo to git"
85 git commit -m "$scr: delete the script
87 We have in fact done the conversion and don't need the script any more."
90 git tag cvs-to-git-conversion
92 cat >$tmp/msg-filter <<'FEND'
96 if ($out =~ m/^\@\@/s &&
97 $out =~ m/^(?:\+ )?[^\@ ].*\w.*$/m) {
98 print $&, "\n\n" or die $!;
100 print $out or die $!;
104 chmod +x $tmp/msg-filter
106 git-filter-branch --msg-filter $tmp/msg-filter \
107 `git-show-ref | awk '{print $2}'`
109 git-show-ref | awk '{print $2}' | grep '^refs/original/' \
110 | xargs -n1 git-update-ref -d
112 rm -rf $tmp/converted
116 git fetch -u $tmp/adjust 'refs/*:refs/*'