1 files changed, 8 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 74d86128cc..b3b6964f95 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2087,6 +2087,14 @@ sub refname {
 	# .. becomes %2E%2E
 	$refname =~ s{\.\.}{%2E%2E}g;
 
+	# trailing dots and .lock are not allowed
+	# .$ becomes %2E and .lock becomes %2Elock
+	$refname =~ s{\.(?=$|lock$)}{%2E};
+
+	# the sequence @{ is used to access the reflog
+	# @{ becomes %40{
+	$refname =~ s{\@\{}{%40\{}g;
+
 	return $refname;
 }