Commit 058f8d5f authored by Michal Čihař's avatar Michal Čihař

Do not commit pending changes if there is nothing to merge (issue #51).

parent f8894d4f
......@@ -399,6 +399,10 @@ class SubProject(models.Model):
# pull remote
self.pull_repo()
# do we have something to merge?
if not self.git_needs_pull():
return True
# commit possible pending changes
self.commit_pending()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment