Move over to canonical llvm organization, couple minor tweaks.

jyknight · Jan 9, 2019 · e48b52f · e48b52f
1 parent a1346e0
commit e48b52f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/llvm-svn2git.sh b/llvm-svn2git.sh
@@ -157,8 +157,8 @@ incremental_update() {
   for repo in $IMPORTED_REPOS; do
     # And rerun filtering
     repo_filter_steps $repo
-    # And, run a gc to auto-repack as required.
-    git -C $repo -c gc.auto=1 gc --auto
+    # And, run a gc to auto-repack as required. Ignore errors, as it returns nonzero for non-fatal warnings.
+    git -C $repo -c gc.auto=1 gc --auto || true
   done
 }
 

diff --git a/make-repos.sh b/make-repos.sh
@@ -3,6 +3,10 @@ token=$(cat migration-oauth-key.txt)
 
 for name in "$@"; do
   curl -i -H "Authorization: token $token" \
-    -d "{ \"name\": \"$name\" }" \
-    https://api.github.com/orgs/llvm-git-prototype/repos
+    -d "{\
+ \"name\": \"$name\",\
+ \"has_issues\": false,\
+ \"has_wiki\": false,\
+ \"has_projects\": false }" \
+    https://api.github.com/orgs/llvm/repos
 done
diff --git a/upload-all.sh b/upload-all.sh
@@ -4,9 +4,13 @@ set -e
 mydir=$(cd $(dirname $0); pwd)
 token=$(cat $mydir/migration-oauth-key.txt)
 
-git -C mono/monorepo push --prune https://$token@github.com/llvm-git-prototype/llvm 'refs/heads/master:refs/heads/master' 'refs/heads/release/*:refs/heads/release/*' 'refs/tags/llvmorg-*:refs/tags/llvmorg-*'
-git -C mono/monorepo push --prune https://$token@github.com/llvm-git-prototype/llvm-legacy-branches 'refs/heads/*:refs/heads/*' 'refs/tags/*:refs/tags/*'
+try2() {
+  "$@" || "$@"
+}
+
+try2 git -C mono/monorepo push --prune https://$token@github.com/llvm/llvm-project 'refs/heads/master:refs/heads/master' 'refs/heads/release/*:refs/heads/release/*' 'refs/tags/llvmorg-*:refs/tags/llvmorg-*'
+try2 git -C mono/monorepo push --prune https://$token@github.com/llvm/llvm-project-legacy-branches 'refs/heads/*:refs/heads/*' 'refs/tags/*:refs/tags/*'
 
 for x in archive lnt test-suite www www-pubs zorg; do
-  git -C split/$x push --prune https://$token@github.com/llvm-git-prototype/$x 'refs/heads/*:refs/heads/*' 'refs/tags/*:refs/tags/*'
+  try2 git -C split/$x push --prune https://$token@github.com/llvm/$x 'refs/heads/*:refs/heads/*' 'refs/tags/*:refs/tags/*'
 done