diff options
| author | Gaëtan Gilbert | 2018-12-18 13:52:52 +0100 |
|---|---|---|
| committer | Gaëtan Gilbert | 2019-01-08 13:33:31 +0100 |
| commit | e323a36fd79000df30bbac9911d00ca80589fb23 (patch) | |
| tree | ab797240389d95894d1fc0d59c489f9855ccdb90 /dev/tools | |
| parent | 8c040974facb733682d24c488dc89941671f4ab7 (diff) | |
merge-pr: add reviewer info to commit message
This produces a commit message like
~~~
Merge PR #9250: coqchk: fix check for kelim with functors
Reviewed-by: ppedrot
Ack-by: mattam92
~~~
Diffstat (limited to 'dev/tools')
| -rwxr-xr-x | dev/tools/merge-pr.sh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh index 5fd8a3b7d9..ca6d9e0d83 100755 --- a/dev/tools/merge-pr.sh +++ b/dev/tools/merge-pr.sh @@ -198,8 +198,25 @@ if [ -z "$(git config user.signingkey)" ]; then warning "gpg will guess a key out of your git config user.* data" fi +# Generate commit message + +info "Fetching review data" +reviews=$(curl -s "$API/pulls/$PR/reviews") +msg="Merge PR #$PR: $TITLE" + +select_state() { + jq -rc 'map(select(.state == "'"$1"'") | .user.login) | join(" ")' <<< "$reviews" +} + +for reviewer in $(select_state APPROVED); do + msg=$(printf '%s\n' "$msg" | git interpret-trailers --trailer Reviewed-by="$reviewer") +done +for reviewer in $(select_state COMMENTED); do + msg=$(printf '%s\n' "$msg" | git interpret-trailers --trailer Ack-by="$reviewer") +done + info "merging" -git merge -v -S --no-ff FETCH_HEAD -m "Merge PR #$PR: $TITLE" -e +git merge -v -S --no-ff FETCH_HEAD -m "$msg" -e # TODO: improve this check if ! git diff --quiet --diff-filter=A "$REMOTE/$CURRENT_LOCAL_BRANCH" -- dev/ci/user-overlays; then |
