Certain characters such as "?" can be present in a CVS tag name, but
git does not allow these characters in tags. If git-cvsimport
encounters a CVS tag that git cannot handle, cvsimport will error and
refuse to continue the import beyond that point.
When importing CVS tags, strip all the inappropriate strings from the
tag names as we translate them to git tag names.
Signed-off-by: Ken Dreyer <ktdreyer@xxxxxxxxxxxx>
---
Thank you Junio for the review. I've taken your suggestion and amended
my patch to eliminate all the bad strings in ref.c.
git-cvsimport.perl | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 8d41610..0dc598d 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -889,7 +889,25 @@ sub commit {
$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
$xtag =~ tr/_/\./ if ( $opt_u );
$xtag =~ s/[\/]/$opt_s/g;
- $xtag =~ s/\[//g;
+
+ # See ref.c for these rules.
+ # Tag cannot end with a '/' - this is already handled above.
+ # Tag cannot contain bad chars. See bad_ref_char in ref.c.
+ $xtag =~ s/[ ~\^:\\\*\?\[]//g;
+ # Tag cannot contain '..'.
+ $xtag =~ s/\.\.//g;
+ # Tag cannot contain '@{'.
+ $xtag =~ s/\@{//g;
+ # Tag cannot end with '.lock'.
+ $xtag =~ s/(?:\.lock)+$//;
+ # Tag cannot begin or end with '.'.
+ $xtag =~ s/^\.+//;
+ $xtag =~ s/\.+$//;
+ # Tag cannot consist of a single '.' - already handled above.
+ # Tag cannot be empty.
+ if ($xtag eq '') {
+ return;
+ }
system('git' , 'tag', '-f', $xtag, $cid) == 0
or die "Cannot create tag $xtag: $!\n";
--
1.7.11.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html