From 43ddaef92555c1f364f5bbed8b19d136a5e746fb Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Fri, 30 Nov 2012 09:55:27 +0000
Subject: Fix merge command

---
(limited to 'devbot/git.py')

diff --git a/devbot/git.py b/devbot/git.py
index f1a7acc..b3f3594 100644
--- a/devbot/git.py
+++ b/devbot/git.py
@@ -39,7 +39,8 @@ class Module:
         if self.tag:
             command.run(["git", "checkout", self.tag])
         else:
-            command.run(["git", "merge", "--ff-only", "origin", self._branch],
+            command.run(["git", "merge", "--ff-only",
+                         "origin/%s" % self._branch],
                         retry=self._retry)
 
     def clean(self):
--
cgit v0.9.1