thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplified backport script

Browse Source
This commit is contained in:
Alexander Kuzmenkov 2020-04-13 15:00:36 +03:00
parent 91e9a543d4
commit 6bd80a357b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/simple-backport/backport.sh
View File

@ -7,8 +7,8 @@ merge_base=$(git merge-base origin/master "origin/$branch")
# Make lists of PRs that were merged into each branch. Use first parent here, or else
# we'll get weird things like seeing older master that was merged into a PR branch
# that was then merged into master.
git log "$merge_base..origin/master" --first-parent --oneline > master-log.txt
git log "$merge_base..origin/$branch" --first-parent --oneline > "$branch-log.txt"
git log "$merge_base..origin/master" --first-parent > master-log.txt
git log "$merge_base..origin/$branch" --first-parent > "$branch-log.txt"
# Search for PR numbers in commit messages. First variant is normal merge, and second
# variant is squashed.
@ -89,11 +89,14 @@ do
continue
fi
# Find merge commit SHA for convenience
merge_sha="$(jq -r .merge_commit_sha "$file")"
url="https://github.com/ClickHouse/ClickHouse/pull/$pr"
printf "%s\t%s\t%s\t%s\n" "$action" "$pr" "$url" "$file" >> "$branch-report.tsv"
printf "%s\t%s\t%s\t%s\t%s\n" "$action" "$pr" "$url" "$file" "$merge_sha" >> "$branch-report.tsv"
if [ "$action" == "backport" ]
then
printf "%s\t%s\n" "$action" "$url"
printf "%s\t%s\t%s\n" "$action" "$url" "$merge_sha"
fi
done