Skip to content

Allow to overwrite uploaded bundle when using `--push-bundle`

Marie Houillon requested to merge allow_to_erase_bundle_repository into master

What does this MR do?

Previous behavior:

It was only possible to use the --push-bundle option on an empty or non-existing git repository.

As a consequence, it was not possible to first push a bundle to a repository, and then to ask for a release of this same repository using the --release-bundle option.

Also, if one wanted to modify a bundle and reuse the --push-bundle option on the same repository, this repository had to be deleted first.

Current behavior:

Before pushing a bundle on a git repository, an attempt to pull from the repository is made. If the repository doesn't exist, this attempt is ignored. Otherwise, the merge strategy is to keep the local changes, which makes that the git repository is erased by the new version of the bundle.

As a consequence, it is now possible to use the --push-bundle option on the same repository multiple times, thus to modify an uploaded bundle.

Related issues

#25 (closed)

Author's checklist

  • Follow the Contribution Guidelines.
  • Apply the appropriate labels.
  • Does this commit add new dependencies (e.g. Python modules)? If yes, please evaluate carefully if the additional dependency is a more sustainable option than including the functionality in own code. If the former, describe the dependency clearly, add them to the Software Management Plan and the installation instructions (*.md files, CMake files, Docker files etc.).

Reviewer's checklist

All reviewers can help ensure accuracy, clarity, completeness, and adherence to the Contribution Guidelines.

Reviewer

  • Review by a code reviewer or other selected colleague to confirm accuracy, clarity, and completeness. This can be skipped for minor fixes without substantive content changes.

Maintainer

  • Review by assigned maintainer, who can always request/require the above reviews.
  • Ensure a release milestone is set.

Merge request reports