diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-30 09:56:51 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-30 09:56:51 (GMT) |
| commit | d0752119848004ffcc0bc1f602de146b7c20dd15 (patch) | |
| tree | a7139dc7f86f38cb133aa07108efc7351b04a257 | |
| parent | 43ddaef92555c1f364f5bbed8b19d136a5e746fb (diff) | |
Merge is local doesn't make sense to retry
| -rw-r--r-- | devbot/git.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/devbot/git.py b/devbot/git.py index b3f3594..e0519da 100644 --- a/devbot/git.py +++ b/devbot/git.py @@ -40,8 +40,7 @@ class Module: command.run(["git", "checkout", self.tag]) else: command.run(["git", "merge", "--ff-only", - "origin/%s" % self._branch], - retry=self._retry) + "origin/%s" % self._branch]) def clean(self): try: |