[tor-commits] [gettor/master] Update file script

[hiro@xxxxxxxxxxxxxx]

commit 3dba52b3ee321af8a84f3464d6cd4ff5a98da6a6
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Sat Sep 28 19:34:34 2019 +0200

    Update file script
---
 scripts/update_files | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/update_files b/scripts/update_files
index 574688b..6b9546a 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -11,8 +11,6 @@
 
 cd ~/releases
 git checkout master
-git branch -D releases
-git push origin --delete releases
 git branch -D torbrowser-releases
 git push github --delete torbrowser-releases
 
@@ -36,18 +34,15 @@ for row in $(
     );
     if [[ $r = *[!\ ]* ]]; then
       git fetch --all
-      git checkout releases
       wget $r
       git add .
       git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads'
-      diffs=$(git diff origin/releases)
+      diffs=$(git diff origin/torbrowser-releases)
       if [ -z "$diffs" ]; then
           echo "No new releases"
       else
-          git push -f --follow-tags origin releases
+          git push -f --follow-tags origin torbrowser-releases
       fi
-      git checkout torbrowser-releases
-      git merge releases
       diffs=$(git diff github/torbrowser-releases)
       if [ -z "$diffs" ]; then
           echo "No new releases"

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits