From 1f8ca56916980f7e5c71bf1307c6fb5ef63efc20 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 24 Jul 2020 19:24:25 +0500 Subject: [PATCH] fix a minor upgrade bug if on dev branch --- plogical/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 33ce9c40d..019ca03db 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1439,7 +1439,7 @@ class Upgrade: command = 'git status' 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' Upgrade.executioner(command, command, 1)