mirror of
https://github.com/Tygs/0bin.git
synced 2023-08-10 21:13:00 +03:00
Changing repo status checking strategy, again, again
This commit is contained in:
parent
b873215dd8
commit
8ce3793ff6
2
dodo.py
2
dodo.py
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user