Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#!/usr/bin/env bash set -Eeuxo pipefail function merge() { id="$1"; title="$2" git pull --no-ff --no-commit --strategy-option 'theirs' 'openSUSE' "pull/$id/head" git commit --message "Merge #$id \"$title\"" items+=( "- [ ] $title [#$id](https://github.com/openSUSE/osem/pull/$id)" ) } function pick() { hash="$1"; title="$2" git cherry-pick "$hash" rebased="$(git rev-parse HEAD)" items+=( "- [ ] $title [\`${rebased:0:7}\`]($rebased)" ) } function revert() { hash="$1"; title="$2"; note="$3" git revert --no-edit "$hash" items+=( "- [ ] Revert “$title” [\`${hash:0:7}\`](openSUSE@$hash) ($note)" ) } items=() git fetch --all --prune git checkout 'main' git reset --hard 'openSUSE/master' merge '2654' 'Fix access to the version history of organization-level roles' pick '5997a3194383e63088a400896dcb7c78f5b562c7' 'Restore now-passing tests' merge '3058' 'Add surveys during CFP response' merge '3059' 'Add setting to disable email notifications of comments' pick '3b4da2f6930bcd09a5cdecd5b0efc57ed80b6c87' 'Configure for deployment to Dokku' pick '7afa84bb1e4d34e5d0eda2176f1519fff1588307' 'Restore lost admin forms [openSUSE#2975](openSUSE#2975)' IFS=$'\n' cat << MARKDOWN > 'README.md' # About this branch Our goal is to run [upstream] OSEM without modifications to its codebase. We currently still make a few modifications in this transitional branch: ${items[*]} These divergences from upstream should be seen as a to-do list, where completing an item means either solving its need in a general way upstream, or adjusting our procedures to accommodate upstream’s existing capabilities or limitations. ## Guidelines Don’t develop on this branch. It follows upstream by regularly **rebasing** the above modifications. When a modification is no longer necessary, it will be dropped during the rebase. When there are no remaining modifications, this branch will be deleted. [upstream]: https://github.com/openSUSE/osem MARKDOWN git add 'README.md' git commit --message "Document branch $(cat "${BASH_SOURCE[0]}")" git --no-pager log --color --oneline 'openSUSE/master'..'main'
- Loading branch information