mirror
/
0bin
mirror of https://github.com/Tygs/0bin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changing repo status checking strategy, again, again

This commit is contained in:
ksamuel 2020-08-31 16:30:05 +02:00
parent b873215dd8
commit 8ce3793ff6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dodo.py
View File

@ -91,7 +91,7 @@ def task_bump_version():
sys.exit("You must be on the branch master to do that")
git("fetch", "origin", "master")
if git("git", "rev-list", "HEAD...origin/master", "--count") != "0":
if git("rev-parse", "@{u}") != git("merge-base", "@", "@{u}"):
sys.exit("Cannot push a new version, you need to pull first")
git_status = git("status", "--porcelain=1").split("\n")