Merge branch '2.3'

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/deploy.py b/tools/deploy.py
index 910833c722..407299a9aa 100644
--- a/tools/deploy.py
+++ b/tools/deploy.py
@@ -68,7 +68,13 @@ def git_info(info, path="."):
     elif info == "describe":
         # A dirty git state should only be possible on local builds, but since
         # this script may be used locally we'll add it here.
-        cmd = ("git", "describe", "--always", "--dirty=-modified")
+        cmd = (
+            "git",
+            "describe",
+            "--always",
+            "--first-parent",
+            "--dirty=-modified",
+        )
     else:
         raise ValueError("Invalid git info type!")