Merge pull request #326 from yungwine/dev

fix update/upgrade commit

Author: igroman787

mytonctrl/mytonctrl.py

@@ -42,7 +42,7 @@
 )
 from mytoncore.telemetry import is_host_virtual
 from mytonctrl.migrate import run_migrations
-from mytonctrl.utils import GetItemFromList, timestamp2utcdatetime, fix_git_config
+from mytonctrl.utils import GetItemFromList, timestamp2utcdatetime, fix_git_config, is_hex
 
 import sys, getopt, os
 
@@ -334,8 +334,11 @@ def check_git(input_args, default_repo, text, default_branch='master'):
 #end define
 
 def check_branch_exists(author, repo, branch):
+	if is_hex(branch):
+		print('Hex name detected, skip branch existence check.')
+		return
 	url = f"https://github.com/{author}/{repo}.git"
-	args = ["git", "ls-remote", "--heads", url, branch]
+	args = ["git", "ls-remote", "--heads", "--tags", url, branch]
 	process = subprocess.run(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3)
 	output = process.stdout.decode("utf-8")
 	if branch not in output:

mytonctrl/scripts/upgrade.sh

@@ -63,8 +63,8 @@ rm -rf ${srcdir}/${repo}
 
 # Update code
 echo "https://github.com/${author}/${repo}.git -> ${branch}"
-git clone --branch ${branch} --recursive https://github.com/${author}/${repo}.git
-cd ${repo}
+git clone --recursive https://github.com/${author}/${repo}.git
+cd ${repo} && git checkout ${branch}
 export CC=/usr/bin/clang
 export CXX=/usr/bin/clang++
 export CCACHE_DISABLE=1

mytonctrl/utils.py

@@ -15,6 +15,14 @@ def GetItemFromList(data, index):
         pass
 
 
+def is_hex(s):
+    try:
+        int(s, 16)
+        return True
+    except ValueError:
+        return False
+
+
 def fix_git_config(git_path: str):
     args = ["git", "status"]
     try: