git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b71db2
)
fix git update
author
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 5 Jul 2010 13:13:38 +0000
(15:13 +0200)
committer
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 5 Jul 2010 13:13:38 +0000
(15:13 +0200)
module-tools.py
patch
|
blob
|
history
diff --git
a/module-tools.py
b/module-tools.py
index
7aea7ac
..
52653ea
100755
(executable)
--- a/
module-tools.py
+++ b/
module-tools.py
@@
-291,6
+291,10
@@
class GitRepository:
return self.__run_in_repo(c.run_fatal)
def update(self, subdir=None, recursive=None, branch="master"):
return self.__run_in_repo(c.run_fatal)
def update(self, subdir=None, recursive=None, branch="master"):
+ if branch == "master":
+ self.__run_command_in_repo("git checkout %s" % branch)
+ else:
+ self.__run_command_in_repo("git checkout origin/%s" % branch)
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)
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)
@@
-624,6
+628,8
@@
that for other purposes than tagging""" % options.workdir
self.repository.update(branch=self.branch)
elif hasattr(self,'tagname'):
self.repository.update(branch=self.tagname)
self.repository.update(branch=self.branch)
elif hasattr(self,'tagname'):
self.repository.update(branch=self.tagname)
+ else:
+ self.repository.update()
def main_specname (self):
attempt="%s/%s.spec"%(self.module_dir,self.name)
def main_specname (self):
attempt="%s/%s.spec"%(self.module_dir,self.name)