paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 16:40:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 65386 #dd0c00b3a1 from trunk:

Browse Source 
svn2revisioninc: improve lookup of git-svn-id
........

git-svn-id: branches/fixes_2_2@65387 -
This commit is contained in:
martin 2021-07-06 20:19:23 +00:00
parent 55e869b83c
commit 7bdd832152
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/svn2revisioninc.pas
View File

@ -699,12 +699,12 @@ var
sha1: string;
begin
Result := False;
// git svn uses /remote/svn/<branch> as remote
sha1 := GetGitCommitInRemoteBranch('svn/*');
sha1 := GetGitCommitInRemoteBranch; // try any remote branch
if sha1 <> '' then begin
Result := GetRevisionFromGitVersion(sha1);
if not Result then begin
sha1 := GetGitCommitInRemoteBranch; // try any remote branch
// git svn uses /remote/svn/<branch> as remote
sha1 := GetGitCommitInRemoteBranch('svn/*');
Result := GetRevisionFromGitVersion(sha1);
end;
end;