mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ss/maint-msys-cvsexportcommit'

Browse Source 
* ss/maint-msys-cvsexportcommit:
  git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
  t9200: On MSYS, do not pass Windows-style paths to CVS
This commit is contained in:
Junio C Hamano
2012-01-12 23:34:21 -08:00
parent bdb8cb5296 37495eef4c
commit 96e3360997
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-cvsexportcommit.perl
View File

@ -30,6 +30,13 @@ if ($opt_w || $opt_W) {
chomp($gd); chomp($gd);
$ENV{GIT_DIR} = $gd; $ENV{GIT_DIR} = $gd;
} }
# On MSYS, convert a Windows-style path to an MSYS-style path
# so that rel2abs() below works correctly.
if ($^O eq 'msys') {
$ENV{GIT_DIR} =~ s#^([[:alpha:]]):/#/$1/#;
}
# Make sure GIT_DIR is absolute # Make sure GIT_DIR is absolute
$ENV{GIT_DIR} = File::Spec->rel2abs($ENV{GIT_DIR}); $ENV{GIT_DIR} = File::Spec->rel2abs($ENV{GIT_DIR});
} }

6
t/t9200-git-cvsexportcommit.sh
View File

@ -19,9 +19,9 @@ then
test_done test_done
fi fi
CVSROOT=$(pwd)/cvsroot CVSROOT=$PWD/cvsroot
CVSWORK=$(pwd)/cvswork CVSWORK=$PWD/cvswork
GIT_DIR=$(pwd)/.git GIT_DIR=$PWD/.git
export CVSROOT CVSWORK GIT_DIR export CVSROOT CVSWORK GIT_DIR
rm -rf "$CVSROOT" "$CVSWORK" rm -rf "$CVSROOT" "$CVSWORK"