download: support --ff when cherry-picking

The git cherry-pick already supports this, so plumb the existing repo
option down.  Otherwise it's confusing when people use -c --ff and it
doesn't use that behavior.

Change-Id: Id68932ffa09204bb30b92a21aff185c00394a520
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/259852
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/project.py b/project.py
index 4c8c2bab..a58af4ff 100644
--- a/project.py
+++ b/project.py
@@ -2681,8 +2681,10 @@ class Project(object):
       if self._allrefs:
         raise GitError('%s checkout %s ' % (self.name, rev))
 
-  def _CherryPick(self, rev):
+  def _CherryPick(self, rev, ffonly=False):
     cmd = ['cherry-pick']
+    if ffonly:
+      cmd.append('--ff')
     cmd.append(rev)
     cmd.append('--')
     if GitCommand(self, cmd).Wait() != 0: