From 446bcb2acc36d9ee49bcec2b4adef632de4b4524 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 15 Feb 2012 11:00:11 +0000 Subject: [PATCH] dd support for fetching SVN revision from pure-git clones (#1579) git-svn-id: http://svn.osgeo.org/postgis/trunk@9193 b70326c6-7e19-0410-871a-916f4a2858ee --- utils/svn_repo_revision.pl | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/utils/svn_repo_revision.pl b/utils/svn_repo_revision.pl index 82b79e7d1..b573221db 100755 --- a/utils/svn_repo_revision.pl +++ b/utils/svn_repo_revision.pl @@ -60,17 +60,15 @@ sub read_rev_git { } chop($git_exe); - my $cmd = "${git_exe} svn info"; + my $cmd = "${git_exe} log --grep=git-svn -1 | grep git-svn | cut -d@ -f2 | cut -d' ' -f1"; #print STDERR "cmd: ${cmd}\n"; - my $svn_info = `$cmd`; - #print STDERR "git_svn_info_output: [[[${svn_info}]]]\n"; + my $rev = `$cmd`; - my $rev; - if ( $svn_info =~ /Last Changed Rev: (\d+)/ ) { - $rev = $1; - } else { - print STDERR "Can't fetch SVN revision: no 'Loast Changed Rev' in `git svn info` output\n"; + if ( ! $rev ) { + print STDERR "Can't fetch SVN revision from git log\n"; $rev = 0; + } else { + chop($rev); } return $rev; -- 2.40.0