git-migration: cvs2git_fixes.sh - clean whitespaces
draenog
draenog at pld-linux.org
Wed Feb 9 10:17:52 CET 2011
Author: draenog Date: Wed Feb 9 09:17:52 2011 GMT
Module: git-migration Tag: HEAD
---- Log message:
- clean whitespaces
---- Files affected:
git-migration:
cvs2git_fixes.sh (1.4 -> 1.5)
---- Diffs:
================================================================
Index: git-migration/cvs2git_fixes.sh
diff -u git-migration/cvs2git_fixes.sh:1.4 git-migration/cvs2git_fixes.sh:1.5
--- git-migration/cvs2git_fixes.sh:1.4 Wed Feb 9 10:14:57 2011
+++ git-migration/cvs2git_fixes.sh Wed Feb 9 10:17:47 2011
@@ -4,12 +4,12 @@
#
# It fixes following problems
#
-# Branches which are no longer labelled can exist in CVS. cvs2git names them
+# Branches which are no longer labelled can exist in CVS. cvs2git names them
# unlabeled-<revision>. The script changes "unlabeled" to specified name or
# deleted them if name is unspecified
# Often in CVS repo only changed file are tagged. In this case cvs2git produces
-# superfluous commits to delete not tagged file. Here the tag in converted git
+# superfluous commits to delete not tagged file. Here the tag in converted git
# repo is moved to the parent if the tagged commit:
# 1. was made by cvs2svn
# 2. the only change in the tree is deletion of files
@@ -30,7 +30,7 @@
while read rev branchname; do
if [ -z "$name" ]; then
git update-ref -d "$branchname" $rev
- else
+ else
new_branchname=`echo $branchname | sed -e "s/unlabeled-\([0-9.]\+\)$/${name}-\1/"`
if [ "$branchname" != "$new_branchname" ]; then
git update-ref "$new_branchname" $rev "" && git update-ref -d "$branchname" $rev
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/git-migration/cvs2git_fixes.sh?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list