diff options
Diffstat (limited to 'libsanitizer/merge.sh')
| -rwxr-xr-x | libsanitizer/merge.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh index 2f74fbef260..dfa7bf3d196 100755 --- a/libsanitizer/merge.sh +++ b/libsanitizer/merge.sh @@ -8,13 +8,12 @@ VCS=${1:-svn} get_upstream() { rm -rf upstream - #cp -rf orig upstream - svn co http://llvm.org/svn/llvm-project/compiler-rt/trunk upstream + git clone https://github.com/llvm/llvm-project.git upstream } get_current_rev() { cd upstream - svn info | grep Revision | grep -o '[0-9]*' + git rev-parse HEAD } list_files() { @@ -85,6 +84,6 @@ rm -rf upstream cat << EOF > MERGE $CUR_REV -The first line of this file holds the svn revision number of the +The first line of this file holds the git revision number of the last merge done from the master library sources. EOF |