Update merge.sh to reflect usage of git.

Message ID 5eccbb9b.1c69fb81.b4145.8b52SMTPIN_ADDED_MISSING@mx.google.com
State New
Headers show
Series
  • Update merge.sh to reflect usage of git.
Related show

Commit Message

Martin Liška May 25, 2020, 6:55 p.m.
After switching to GIT, we should use it in libsanitizer
merge script. I'll do merge from master as soon as
PR95311 gets fixed.

I'm going to install the patch.

libsanitizer/ChangeLog:

	* LOCAL_PATCHES: Use git hash instead of SVN id.
	* merge.sh: Use git instead of VCS.  Update paths
	relative to upstream git repository.
---
 libsanitizer/LOCAL_PATCHES |  2 +-
 libsanitizer/merge.sh      | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

-- 
2.26.2

Patch

diff --git a/libsanitizer/LOCAL_PATCHES b/libsanitizer/LOCAL_PATCHES
index 292b7a6e489..7732de3d436 100644
--- a/libsanitizer/LOCAL_PATCHES
+++ b/libsanitizer/LOCAL_PATCHES
@@ -1 +1 @@ 
-r277910
+21bb1625bd4f183984223ce31bd03ba47ed62f27
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index dfa7bf3d196..3f4f1629a22 100755
--- a/libsanitizer/merge.sh
+++ b/libsanitizer/merge.sh
@@ -4,8 +4,6 @@ 
 
 # This script merges libsanitizer sources from upstream.
 
-VCS=${1:-svn}
-
 get_upstream() {
   rm -rf upstream
   git clone https://github.com/llvm/llvm-project.git upstream
@@ -33,7 +31,7 @@  change_comment_headers() {
 # This function merges changes from the directory upstream_path to
 # the directory  local_path.
 merge() {
-  upstream_path=upstream/$1
+  upstream_path=upstream/compiler-rt/$1
   local_path=$2
   change_comment_headers $upstream_path
   echo MERGE: $upstream_path
@@ -47,10 +45,10 @@  merge() {
     elif [ -f $upstream_path/$f ]; then
       echo "FOUND IN UPSTREAM :" $f
       cp -v $upstream_path/$f $local_path
-      $VCS add $local_path/$f
+      git add $local_path/$f
     elif [ -f $local_path/$f ]; then
       echo "FOUND IN LOCAL    :" $f
-      $VCS rm $local_path/$f
+      git rm $local_path/$f
     fi
   done
 
@@ -76,7 +74,7 @@  merge lib/ubsan ubsan
 
 # Need to merge lib/builtins/assembly.h file:
 mkdir -p builtins
-cp -v upstream/lib/builtins/assembly.h builtins/assembly.h
+cp -v upstream/compiler-rt/lib/builtins/assembly.h builtins/assembly.h
 
 rm -rf upstream