Skip to content

Commit 7c73d4b

Browse files
authored
Merge pull request #64 from emalm/non-default-meta-branch
Handle non-default branches for metadata repository
2 parents b2c6dd8 + 81a0ad2 commit 7c73d4b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

elekto/models/meta.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ def __init__(self, config):
4242
".format(self.META, self.META)
4343

4444
def clone(self):
45-
os.system('{} clone {} {}'.format(self.git, self.REMOTE, self.META))
45+
os.system('{} clone -b {} -- {} {}'.format(self.git, self.BRANCH, self.REMOTE, self.META))
4646

4747
def pull(self):
48-
os.system('{} pull origin {}'.format(self.pref, self.BRANCH))
48+
os.system('{} pull --ff-only origin {}'.format(self.pref, self.BRANCH))
4949

5050

5151
class Election(Meta):

0 commit comments

Comments
 (0)