tree ef96953c3d9de20552415dc647dba0b8b2a6c631
parent 89e222cb218d126e81dd3b72fa91be8ffa9d6c77
parent a8cf575d68e7e211292d967f4a12cf609a028b20
author Karsten Tausche <karsten@fairphone.com> 1660655655 +0200
committer Karsten Tausche <karsten@fairphone.com> 1660655892 +0200

Merge branch 'upstream/stable' into stable

* upstream/stable: (55 commits)
  Omit local_manifest groups from superproject override.
  status, diff: display correct path for multi-manifest
  project: simplify if-statement
  upload: add ‘--ignore-untracked-files’ option
  man: regenerate
  Fix Projects.shareable_dirs
  Only sync superproject if it will be used.
  sync: add multi-manifest support
  project: initial separation of shared project objects
  upload: move label validation to core function
  tests: switch to tempfile.TemporaryDirectory
  project: fix --use-superproject logic for init.
  manifest: add submanifest.default_groups attribute
  project: Do not exit early on --standalone-manifest.
  project: Add missing imports
  progress: optimize progress bar updates a bit
  Override the manifest for the entire command
  sync: refactor use of self.manifest
  Stop passing optparse.Values to git_superproject
  ManifestProject: add manifest_platform
  ...

Change-Id: I9fedbd65ee13190a79faabd84307f72857c977d7