thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

simple backport script

Browse Source
This commit is contained in:
Alexander Kuzmenkov 2020-05-22 21:44:11 +03:00
parent cd83ebc599
commit 91c8c2ac1a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,14 +13,13 @@ branch_git_cmd=(git log "$merge_base..origin/$branch" --first-parent)
"${branch_git_cmd[@]}" > "$branch-log.txt"
# Check for diamond merges.
"${master_git_cmd[@]}" --oneline --grep "Merge branch '" | grep ''
diamonds_in_master=$?
diamonds_in_master=$("${master_git_cmd[@]}" --oneline --grep "Merge branch '")
diamonds_in_branch=$("${branch_git_cmd[@]}" --oneline --grep "Merge branch '")
"${branch_git_cmd[@]}" --oneline --grep "Merge branch '" | grep ''
diamonds_in_branch=$?
if [ "$diamonds_in_master" -eq 0 ] || [ "$diamonds_in_branch" -eq 0 ]
if [ "$diamonds_in_master" != "" ] || [ "$diamonds_in_branch" != "" ]
then
echo "$diamonds_in_master"
echo "$diamonds_in_branch"
# DO NOT ADD automated handling of diamond merges to this script.
# It is an unsustainable way to work with git, and it MUST be visible.
echo Warning: suspected diamond merges above.