Skip to content
Snippets Groups Projects
Commit f676fa76 authored by Josef Weidendorfer's avatar Josef Weidendorfer Committed by Junio C Hamano
Browse files

Strip any trailing slash on destination argument


Needed because generating a target paths will add another slash.
This fixes e.g. "git-mv file dir/", which removed "file" from
version control by renaming it to "dir//file", as
git-update-index does not accept such paths.

Thanks goes to Ben Lau for noting this bug.

Signed-off-by: default avatarJosef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
parent 085c1e22
Branches
Tags
No related merge requests found
...@@ -54,6 +54,8 @@ my ($src, $dst, $base, $dstDir); ...@@ -54,6 +54,8 @@ my ($src, $dst, $base, $dstDir);
my $argCount = scalar @ARGV; my $argCount = scalar @ARGV;
if (-d $ARGV[$argCount-1]) { if (-d $ARGV[$argCount-1]) {
$dstDir = $ARGV[$argCount-1]; $dstDir = $ARGV[$argCount-1];
# remove any trailing slash
$dstDir =~ s/\/$//;
@srcArgs = @ARGV[0..$argCount-2]; @srcArgs = @ARGV[0..$argCount-2];
foreach $src (@srcArgs) { foreach $src (@srcArgs) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment