diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2681,10 +2681,12 @@ class Project(object): | |||
2681 | if self._allrefs: | 2681 | if self._allrefs: |
2682 | raise GitError('%s checkout %s ' % (self.name, rev)) | 2682 | raise GitError('%s checkout %s ' % (self.name, rev)) |
2683 | 2683 | ||
2684 | def _CherryPick(self, rev, ffonly=False): | 2684 | def _CherryPick(self, rev, ffonly=False, record_origin=False): |
2685 | cmd = ['cherry-pick'] | 2685 | cmd = ['cherry-pick'] |
2686 | if ffonly: | 2686 | if ffonly: |
2687 | cmd.append('--ff') | 2687 | cmd.append('--ff') |
2688 | if record_origin: | ||
2689 | cmd.append('-x') | ||
2688 | cmd.append(rev) | 2690 | cmd.append(rev) |
2689 | cmd.append('--') | 2691 | cmd.append('--') |
2690 | if GitCommand(self, cmd).Wait() != 0: | 2692 | if GitCommand(self, cmd).Wait() != 0: |