Tools/git-repo
1
0
Fork 0
Code Activity

download: support -x when cherry-picking

Browse source 
This is a pretty common option for people to want too use, so include
it as a pass-thru option when cherry-picking.

Bug: https://crbug.com/gerrit/9418
Change-Id: I2a24c1ed7544541719caa4d3c0574347a151a1b0
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/259853
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2020-03-22 12:15:20 -04:00
parent ea43176de0
commit 915fda130e
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
project.py
View file

@ -2681,10 +2681,12 @@ class Project(object):
if self._allrefs:
raise GitError('%s checkout %s ' % (self.name, rev))
def _CherryPick(self, rev, ffonly=False):
def _CherryPick(self, rev, ffonly=False, record_origin=False):
cmd = ['cherry-pick']
if ffonly:
cmd.append('--ff')
if record_origin:
cmd.append('-x')
cmd.append(rev)
cmd.append('--')
if GitCommand(self, cmd).Wait() != 0: