[PATCH] D126222: [libcxx] Fix wrong messages of git version

[Shao-Ce SUN via Phabricator via llvm-commits]

sunshaoce created this revision.
sunshaoce added reviewers: ldionne, kubamracek.
Herald added subscribers: lebedev.ri, mgorny.
Herald added a reviewer: lebedev.ri.
Herald added a project: All.
sunshaoce requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D126222

Files:
  third-party/benchmark/cmake/GetGitVersion.cmake


Index: third-party/benchmark/cmake/GetGitVersion.cmake
===================================================================
--- third-party/benchmark/cmake/GetGitVersion.cmake
+++ third-party/benchmark/cmake/GetGitVersion.cmake
@@ -20,7 +20,7 @@
 
 function(get_git_version var)
   if(GIT_EXECUTABLE)
-      execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "v[0-9]*.[0-9]*.[0-9]*" --abbrev=8
+      execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "llvmorg-[0-9]*.[0-9]*.[0-9]*" --abbrev=8
           WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
           RESULT_VARIABLE status
           OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
@@ -30,11 +30,7 @@
       endif()
       
       string(STRIP ${GIT_DESCRIBE_VERSION} GIT_DESCRIBE_VERSION)
-      if(GIT_DESCRIBE_VERSION MATCHES v[^-]*-) 
-         string(REGEX REPLACE "v([^-]*)-([0-9]+)-.*" "\\1.\\2"  GIT_VERSION ${GIT_DESCRIBE_VERSION})
-      else()
-         string(REGEX REPLACE "v(.*)" "\\1" GIT_VERSION ${GIT_DESCRIBE_VERSION})
-      endif()
+      string(REGEX REPLACE "llvmorg-(.*)" "v\\1"  GIT_VERSION ${GIT_DESCRIBE_VERSION})
 
       # Work out if the repository is dirty
       execute_process(COMMAND ${GIT_EXECUTABLE} update-index -q --refresh
@@ -49,7 +45,7 @@
       if (${GIT_DIRTY})
           set(GIT_DESCRIBE_VERSION "${GIT_DESCRIBE_VERSION}-dirty")
       endif()
-      message(STATUS "git version: ${GIT_DESCRIBE_VERSION} normalized to ${GIT_VERSION}")
+      message(STATUS "Git version: ${GIT_DESCRIBE_VERSION} normalized to ${GIT_VERSION}")
   else()
       set(GIT_VERSION "0.0.0")
   endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D126222.431410.patch
Type: text/x-patch
Size: 1598 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220523/eb20b5df/attachment.bin>