@matheusbsbs / matheus-bagliano / commits / bf655fd700
Fork 0

git-svn: Translate invalid characters in refname

In git some characters are invalid as documented in git-check-ref-format. In subversion these characters might be valid, so a translation is required. This patch does this translation by url escaping characters, that are not allowed. Credit goes to Eric Wong, martin f. krafft and Jan Hudec Signed-off-by: Robert Ewald <robewald@gmx.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Robert Ewald committed Jul 30, 2007 at 11:08 UTC bf655fd7009bf5b8f493c52ca77c0d9e09dcb762
1 file changed +36 -3
git-svn.perl
+36 -3
@@ -938,8 +938,8 @@ sub resolve_local_globs {
938 foreach (command(qw#for-each-ref --format=%(refname) refs/remotes#)) {
939 next unless m#^refs/remotes/$ref->{regex}$#;
940 my $p = $1;
941 - my $pathname = $path->full_path($p);
942 - my $refname = $ref->full_path($p);
941 + my $pathname = desanitize_refname($path->full_path($p));
942 + my $refname = desanitize_refname($ref->full_path($p));
943 if (my $existing = $fetch->{$pathname}) {
944 if ($existing ne $refname) {
945 die "Refspec conflict:\n",
@@ -1239,7 +1239,40 @@ sub new {
1239 $self;
1240 }
1241
1242 -sub refname { "refs/remotes/$_[0]->{ref_id}" }
1242 +sub refname {
1243 + my ($refname) = "refs/remotes/$_[0]->{ref_id}" ;
1244 +
1245 + # It cannot end with a slash /, we'll throw up on this because
1246 + # SVN can't have directories with a slash in their name, either:
1247 + if ($refname =~ m{/$}) {
1248 + die "ref: '$refname' ends with a trailing slash, this is ",
1249 + "not permitted by git nor Subversion\n";
1250 + }
1251 +
1252 + # It cannot have ASCII control character space, tilde ~, caret ^,
1253 + # colon :, question-mark ?, asterisk *, space, or open bracket [
1254 + # anywhere.
1255 + #
1256 + # Additionally, % must be escaped because it is used for escaping
1257 + # and we want our escaped refname to be reversible
1258 + $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg;
1259 +
1260 + # no slash-separated component can begin with a dot .
1261 + # /.* becomes /%2E*
1262 + $refname =~ s{/\.}{/%2E}g;
1263 +
1264 + # It cannot have two consecutive dots .. anywhere
1265 + # .. becomes %2E%2E
1266 + $refname =~ s{\.\.}{%2E%2E}g;
1267 +
1268 + return $refname;
1269 +}
1270 +
1271 +sub desanitize_refname {
1272 + my ($refname) = @_;
1273 + $refname =~ s{%(?:([0-9A-F]{2}))}{chr hex($1)}eg;
1274 + return $refname;
1275 +}
1276
1277 sub svm_uuid {
1278 my ($self) = @_;