Merge branch 'ss/maint-msys-cvsexportcommit'

gitster · gitster · commit 96e33609974a · 2012-01-12T23:34:21.000-08:00
* ss/maint-msys-cvsexportcommit:
  git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
  t9200: On MSYS, do not pass Windows-style paths to CVS
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
@@ -30,6 +30,13 @@
 		chomp($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
 	$ENV{GIT_DIR} = File::Spec->rel2abs($ENV{GIT_DIR});
 }
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
@@ -19,9 +19,9 @@ then
     test_done
 fi
 
-CVSROOT=$(pwd)/cvsroot
-CVSWORK=$(pwd)/cvswork
-GIT_DIR=$(pwd)/.git
+CVSROOT=$PWD/cvsroot
+CVSWORK=$PWD/cvswork
+GIT_DIR=$PWD/.git
 export CVSROOT CVSWORK GIT_DIR
 
 rm -rf "$CVSROOT" "$CVSWORK"

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,13 @@`
`30`	`30`	`chomp($gd);`
`31`	`31`	`$ENV{GIT_DIR} = $gd;`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ # On MSYS, convert a Windows-style path to an MSYS-style path`
	`35`	`+ # so that rel2abs() below works correctly.`
	`36`	`+ if ($^O eq 'msys') {`
	`37`	`+ $ENV{GIT_DIR} =~ s#^([[:alpha:]]):/#/$1/#;`
	`38`	`+ }`
	`39`	`+`
`33`	`40`	`# Make sure GIT_DIR is absolute`
`34`	`41`	`$ENV{GIT_DIR} = File::Spec->rel2abs($ENV{GIT_DIR});`
`35`	`42`	`}`