Commit Graph

11 Commits

Author SHA1 Message Date
Marco Pfatschbacher
76468a9b1b Add checkout --merge-in-base support (#40)
* Add checkout --merge-in-base support

When using this option, the checkout will try to merge in the
base branch into each module by running:
`git merge --no-edit origin/<base-branch>`

Retain the unmodified "BaseRevision" info in the Module struct
so it can be used in case it was overwritten by
`applyPullRequestsOverride()`

* only merge base if necessary

* Check if baseRevision is set

Co-authored-by: Bernd Ahlers <bernd@users.noreply.github.com>

---------

Co-authored-by: Bernd Ahlers <bernd@users.noreply.github.com>
2023-12-05 09:53:02 +01:00
Bernd Ahlers
fc5ee6c5a3 Replace go-spew with pp 2023-01-13 12:46:51 +01:00
Bernd Ahlers
7063cbf08d Add support for selecting modules based on their assembly 2023-01-04 15:43:33 +01:00
Bernd Ahlers
b7971db06a Improve verbose status output
Allow multiple "-v" flags to increase the verbosity.
2022-07-06 11:58:45 +02:00
Bernd Ahlers
73263208c3 Add --pull-requests flag to checkout command
This uses GitHub's way of checking out a pull-request locally.

See: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally
2020-06-05 19:02:37 +02:00
Bernd Ahlers
98cda1b1ec Add relaxed flag to update command 2020-05-29 17:51:57 +02:00
Bernd Ahlers
e3d65993be Add update command to update all repositories 2020-05-29 17:10:07 +02:00
Bernd Ahlers
23c6bfc7e0 Override repository-root for all commands in CI environments (#19)
Previously we only did it for the checkout command.
2020-05-05 09:57:14 +02:00
Bernd Ahlers
9e6369006a Add a module-override option to the checkout command
This can be used to override the revision for a module in the given
manifest.
2017-04-29 17:34:49 +02:00
Bernd Ahlers
473d7c9168 Set default repository root to ".repos" when running in CI environment 2017-04-29 15:14:49 +02:00
Bernd Ahlers
80ebf85e88 Initial commit 2017-04-07 17:11:08 +02:00