Skip to content

Commit

Permalink
git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS
Browse files Browse the repository at this point in the history
Due to MSYS path mangling GIT_DIR contains a Windows-style path when
checked inside a Perl script even if GIT_DIR was previously set to an
MSYS-style path in a shell script. So explicitly convert to an MSYS-style
path before calling Perl's rel2abs() to make it work.

This fix was inspired by a very similar patch in WebKit:

http://trac.webkit.org/changeset/76255/trunk/Tools/Scripts/commit-log-editor

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Tested-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
sschuberth authored and gitster committed Jan 12, 2012
1 parent 4397c65 commit 37495ee
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions git-cvsexportcommit.perl
Expand Up @@ -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});
}
Expand Down

0 comments on commit 37495ee

Please sign in to comment.