From f71d49ce0bb4ed29f0039aa917cfdf46dd7c8128 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Tue, 27 Jul 2010 15:45:46 +0200 Subject: [PATCH] use to_branch for update to map a local branch to the remote one. this will fix the issue with branches. --- module-tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-tools.py b/module-tools.py index ea90f56c..f14da959 100755 --- a/module-tools.py +++ b/module-tools.py @@ -302,7 +302,7 @@ class GitRepository: if branch == "master": self.__run_command_in_repo("git checkout %s" % branch) else: - self.__run_command_in_repo("git checkout origin/%s" % branch) + self.to_branch(branch, remote=True) self.__run_command_in_repo("git fetch origin --tags") self.__run_command_in_repo("git fetch origin") self.__run_command_in_repo("git merge --ff origin/%s" % branch) @@ -338,7 +338,7 @@ class GitRepository: if branch == "master": self.__run_command_in_repo("git push") else: - self.__run_command_in_repo("git push %s:%s" % (branch, branch)) + self.__run_command_in_repo("git push origin %s:%s" % (branch, branch)) self.__run_command_in_repo("git push --tags") def revert(self, f=""): -- 2.43.0