newBranch = M.generateBranchName(issue, suffix=suffix, version=branch)
if not M.git().hasBranch(newBranch):
break
- fetcher.pull(into=newBranch)
+ fetcher.pull(into=newBranch, track=M.get('stablebranch'))
def pickPatches(self, mdl):
"""Prompts the user to pick a patch"""
if not self.M.git().merge('FETCH_HEAD'):
raise FetchException('Merge failed, resolve the conflicts and commit')
- def pull(self, into=None):
+ def pull(self, into=None, track=None):
"""Fetch and merge the fetched branch into a branch passed as param"""
self._stash()
if not git.hasBranch(into):
if self.canCreateBranch:
- if not git.createBranch(into):
+ if not git.createBranch(into, track=track):
raise FetchException('Could not create the branch %s' % (into))
else:
raise FetchException('Branch %s does not exist and create branch is forbidden' % (into))