From 6b3d855c39b2d867a851bcd8950b7ea409d79fdf Mon Sep 17 00:00:00 2001 From: MinSeong Kim Date: Sat, 9 Sep 2017 14:17:52 +0000 Subject: [PATCH] [CMake] Update GetSVN.cmake to handle repo Summary: When repo is used with git, 'clang --version' option does not display the correct revision information (i.e. git hash on TOP) as the following: clang version 6.0.0 ---> clang version 6.0.0 (clang version) (llvm version) This is because repo also creates .git/svn folder as git-svn does and this makes repo with git uses "git svn info" command, which is only for git-svn, to retrieve its revision information, making null for the info. To correctly distinguish between git-svn and repo with git, the folder hierarchy to specify for git-svn should be .git/svn/refs as the "git svn info" command depends on the revision data in .git/svn/refs. This patch in turn makes repo with git passes through to the third macro, get_source_info_git, in get_source_info function, resulting in correctly retrieving the revision information for repo with git using "git log ..." command. This patch is tested with git, svn, git-svn, and repo with git. Reviewers: llvm-commits, probinson, rnk Reviewed By: rnk Subscribers: rnk, mehdi_amini, beanz, mgorny Differential Revision: https://reviews.llvm.org/D35532 llvm-svn: 312864 --- cmake/modules/GetSVN.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/GetSVN.cmake b/cmake/modules/GetSVN.cmake index 0a673b908f1..f729395f6e4 100644 --- a/cmake/modules/GetSVN.cmake +++ b/cmake/modules/GetSVN.cmake @@ -84,7 +84,7 @@ endmacro() function(get_source_info path revision repository) if (EXISTS "${path}/.svn") get_source_info_svn("${path}" revision repository) - elseif (EXISTS "${path}/.git/svn") + elseif (EXISTS "${path}/.git/svn/refs") get_source_info_git_svn("${path}" revision repository) elseif (EXISTS "${path}/.git") get_source_info_git("${path}" revision repository)