From 7bdd8321523b3cca3554dd0ee6f5d3d38f8c940c Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Tue, 6 Jul 2021 20:19:23 +0000
Subject: [PATCH] Merged revision(s) 65386 #dd0c00b3a1 from trunk:
 svn2revisioninc: improve lookup of git-svn-id ........

git-svn-id: branches/fixes_2_2@65387 -
---
 tools/svn2revisioninc.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/svn2revisioninc.pas b/tools/svn2revisioninc.pas
index 0f02b5dfc4..efa6967368 100644
--- a/tools/svn2revisioninc.pas
+++ b/tools/svn2revisioninc.pas
@@ -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;