diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-12 08:05:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-12 08:05:28 +0900 |
| commit | fe0a9eaf31dd0c349ae4308498c33a5c3794b293 (patch) | |
| tree | d58beeacadce08282804ab8c99d258d5fa0033c7 /git-svn.perl | |
| parent | 8b026edac3104ecc40a68fd58b764fb3c717babb (diff) | |
| parent | cb427e9eb0243fe7a1a22ea3bd0a46b7410c0bf3 (diff) | |
Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn
* 'svn/authors-prog-2' of git://bogomips.org/git-svn:
git-svn: allow empty email-address using authors-prog and authors-file
git-svn: search --authors-prog in PATH too
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 a6b6c3e40c..050f2a36f4 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -374,7 +374,8 @@ version() if $_version; usage(1) unless defined $cmd; load_authors() if $_authors; if (defined $_authors_prog) { - $_authors_prog = "'" . File::Spec->rel2abs($_authors_prog) . "'"; + my $abs_file = File::Spec->rel2abs($_authors_prog); + $_authors_prog = "'" . $abs_file . "'" if -x $abs_file; } unless ($cmd =~ /^(?:clone|init|multi-init|commit-diff)$/) { |