build: actually run import-patches on gclient sync (#17885)
This commit is contained in:
parent
bb9e92a5d9
commit
341592119f
3 changed files with 13 additions and 8 deletions
|
@ -17,13 +17,7 @@ def main(argv):
|
|||
help="use 3-way merge to resolve conflicts")
|
||||
args = parser.parse_args(argv)
|
||||
|
||||
# save the upstream HEAD so we can refer to it when we later export patches
|
||||
git.update_ref(
|
||||
repo='.',
|
||||
ref='refs/patches/upstream-head',
|
||||
newvalue='HEAD'
|
||||
)
|
||||
git.am(
|
||||
git.import_patches(
|
||||
repo='.',
|
||||
patch_data=patch_from_dir(args.patch_dir),
|
||||
threeway=args.threeway
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue