Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5717238d authored by Hall Liu's avatar Hall Liu
Browse files

Add instructions for local cherry-pick in preupload 

Add instructions for performing a local cherry-pick from master to AOSP
in the preupload hook that enforces having an AOSP cherry-pick.

Test: text only
Change-Id: I38fef239c410d83c66698401e54ededcb69faaf9
parent 1fe06dda

scripts/aosp_tag_preupload.py

+10 −1
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ change contains confidential or security-sensitive information), please state 
that it's infeasible and provide reasoning as follows:



  AOSP: Infeasible <your reasoning here>



If you need to cherry-pick your change from an internal branch to AOSP before

uploading, you can do so locally by adding the internal branch as a remote in

AOSP:

  git remote add goog-master /path/to/your/remote/branch/.git

starting a new branch in AOSP:

  repo start <your-branch-name>-cp

then fetching and cherry-picking the change:

  git fetch goog-master your-branch-name && git cherry-pick FETCH_HEAD

"""



def main():