diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2012-05-15 18:44:09 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2012-05-15 18:44:09 +0000 |
| commit | bf0bf743d7ed6c2e768bc92d4c09c21a7b6edc0e (patch) | |
| tree | 348c88d0617ffbd655cb514c7a9312b5e0105c92 /llvm | |
| parent | c4a8a76048e91baecb5746b80b9733e4af299937 (diff) | |
| download | bcm5719-llvm-bf0bf743d7ed6c2e768bc92d4c09c21a7b6edc0e.tar.gz bcm5719-llvm-bf0bf743d7ed6c2e768bc92d4c09c21a7b6edc0e.zip | |
[utils] Fix Get{RepositoryPath,SourceVersion} to have a more robust is-git-svn
check.
llvm-svn: 156836
Diffstat (limited to 'llvm')
| -rwxr-xr-x | llvm/utils/GetRepositoryPath | 2 | ||||
| -rwxr-xr-x | llvm/utils/GetSourceVersion | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/utils/GetRepositoryPath b/llvm/utils/GetRepositoryPath index 326231c9e5d..f3b0cc56e25 100755 --- a/llvm/utils/GetRepositoryPath +++ b/llvm/utils/GetRepositoryPath @@ -16,7 +16,7 @@ fi cd $1 if [ -d .svn ]; then svn info | grep 'URL:' | cut -d: -f2- -elif [ -d .git/svn ]; then +elif [ -f .git/svn/.metadata ]; then git svn info | grep 'URL:' | cut -d: -f2- elif [ -d .git ]; then git remote -v | grep 'fetch' | awk '{ print $2 }' diff --git a/llvm/utils/GetSourceVersion b/llvm/utils/GetSourceVersion index cbed7daf5b6..b57a6aa2f3a 100755 --- a/llvm/utils/GetSourceVersion +++ b/llvm/utils/GetSourceVersion @@ -16,7 +16,7 @@ fi cd $1 if [ -d .svn ]; then svnversion | sed -e "s#\([0-9]*\)[A-Z]*#\1#" -elif [ -d .git/svn ]; then +elif [ -f .git/svn/.metadata ]; then git svn info | grep 'Revision:' | cut -d: -f2- elif [ -d .git ]; then git log -1 --pretty=format:%H |
