fix a minor upgrade bug if on dev branch

This commit is contained in:
Usman Nasir
2020-07-24 19:24:25 +05:00
parent e401b465ad
commit 1f8ca56916

View File

@@ -1439,7 +1439,7 @@ class Upgrade:
command = 'git status' command = 'git status'
currentBranch = subprocess.check_output(shlex.split(command)).decode() currentBranch = subprocess.check_output(shlex.split(command)).decode()
if currentBranch.find('On branch %s' % (branch)) > -1: if currentBranch.find('On branch %s' % (branch)) > -1 and currentBranch.find('On branch %s-dev' % (branch)) == -1:
command = 'git stash' command = 'git stash'
Upgrade.executioner(command, command, 1) Upgrade.executioner(command, command, 1)