diff options
| author | Michael G. Schwern <schwern@pobox.com> | 2012-07-28 09:38:29 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2012-08-02 21:44:04 (GMT) |
| commit | ca475a61f8c07d475c505bf64d219f7e9d61e728 (patch) | |
| tree | b204f8e670d44dec484bd7f6af427e2fd87afc5d /git-svn.perl | |
| parent | 280ad88aa0e851b2f2945222edb8e7b681a7574b (diff) | |
| download | git-ca475a61f8c07d475c505bf64d219f7e9d61e728.zip git-ca475a61f8c07d475c505bf64d219f7e9d61e728.tar.gz git-ca475a61f8c07d475c505bf64d219f7e9d61e728.tar.bz2 | |
git-svn: add join_paths() to safely concatenate paths
Otherwise you might wind up with things like...
my $path1 = undef;
my $path2 = 'foo';
my $path = $path1 . '/' . $path2;
creating '/foo'. Or this...
my $path1 = 'foo/';
my $path2 = 'bar';
my $path = $path1 . '/' . $path2;
creating 'foo//bar'.
Could have used File::Spec, but I'm shying away from it due to SVN
1.7's pickiness about paths. Felt it would be better to have our own
we can control completely.
[ew: commit title]
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index a857484..6e3e240 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -34,6 +34,7 @@ use Git::SVN::Utils qw( can_compress canonicalize_path canonicalize_url + join_paths ); use Git qw( @@ -1275,7 +1276,7 @@ sub get_svnprops { $path = $cmd_dir_prefix . $path; fatal("No such file or directory: $path") unless -e $path; my $is_dir = -d $path ? 1 : 0; - $path = $gs->{path} . '/' . $path; + $path = join_paths($gs->{path}, $path); # canonicalize the path (otherwise libsvn will abort or fail to # find the file) |