sonatype-lift[bot] commented on code in PR #1263: URL: https://github.com/apache/solr/pull/1263#discussion_r1060206704
########## dev-tools/scripts/cherrypick.sh: ########## @@ -0,0 +1,215 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Forked and adapted from https://github.com/factorial-io/cherrypicker - MIT license +# Copyright (c) 2017 Shibin Das - @d34dman + +function LOG() { + local STATUS=$1 + local MESSAGE=$2 + echo "[$(date)] ${STATUS} ${MESSAGE}" +} + +function usage() { + cat << EOF +Usage: dev-tools/scripts/cherrypick.sh [<options>] <commit-hash> [<commit-hash>...] + -b <branch> Sets the branch(es) to cherry-pick to, typically branch_Nx or branch_x_y + -s Skips precommit test. WARNING: Always run precommit for code- and doc changes + -t Run the full test suite during check, not only precommit + -n Skips git pull of target branch. Useful if you are without internet access + -a Enters automated mode. Aborts cherry-pick and exits on error + -r <remote> Specify remote to push to. Defaults to whatever the branch is tracking. + -p Push to remote. Only done if both cherry-pick and tests succeeded + WARNING: Never push changes to a remote branch before a thorough local test + +Simple script for aiding in back-porting one or more (trivial) commits to other branches. +On merge conflict the script will run 'git mergetool'. See 'git mergetool --help' +for help on configuring your favourite merge tool. Check out Sublime Merge (smerge). + +Example: + # Backport two commits to both stable and release branches + dev-tools/scripts/cherrypick.sh -b branch_9x -b branch_9_0 deadbeef0000 cafebabe1111 +EOF +} + +function yesno() { + question=$1 + unset answer + echo "$question" + while [[ "$answer" != "y" ]] && [[ "$answer" != "n" ]]; do + read -r answer + if [[ "$answer" == "y" ]]; then + true + else + false + fi + done +} + +GIT_COMMAND=git +PRECOMMIT="true" +TESTARG="-x test" +TEST= +TESTS_PASSED= +PUSH= +REMOTE= +NOPULL= +AUTO_MODE= +unset BRANCHES + +while getopts ":b:phstnar:" opt; do + case ${opt} in + b) + BRANCHES+=("$OPTARG") + ;; + r) + REMOTE=$OPTARG + ;; + p) + PUSH=true + ;; + s) + PRECOMMIT= + ;; + a) + AUTO_MODE="true" + ;; + n) + NOPULL="true" + ;; + t) + TEST="true" + TESTARG="" + ;; + h) + usage + exit 0 + ;; + \?) + echo "Unknown option $OPTARG" + usage + exit 1 + esac +done +shift $((OPTIND -1)) + +COMMITS=( "$@" ) + +if [ ${#BRANCHES[@]} -eq 0 ]; then + LOG INFO "Lacking -b option, must specify target branch. Supports multiple -b options too" + usage + exit +fi + +if [ ${#COMMITS[@]} -eq 0 ]; then + LOG ERROR "Please specify one or more commits" + usage + exit +fi + +## Loop over branches +for BRANCH in "${BRANCHES[@]}"; do + echo "" + LOG "INFO" "============================================"; + LOG "INFO" "Git branch: $BRANCH" + LOG "INFO" "============================================"; + echo "" + LOG INFO "Checking out target branch $BRANCH" + # shellcheck disable=SC2086 + $GIT_COMMAND checkout $BRANCH + if [ $? -gt 0 ]; then Review Comment: <picture><img alt="5% of developers fix this issue" src="https://lift.sonatype.com/api/commentimage/fixrate/5/display.svg";></picture> đŦ 3 similar findings have been found in this PR --- *[SC2181](https://github.com/koalaman/shellcheck/wiki/SC2181):* Check exit code directly with e.g. 'if ! mycmd;', not indirectly with $?. --- <details><summary><b>đ Expand here to view all instances of this finding</b></summary><br/> <div align=\"center\"> | **File Path** | **Line Number** | | ------------- | ------------- | | dev-tools/scripts/cherrypick.sh | [154](https://github.com/apache/solr/blob/5884467f49024e2fa15eb51f77f04d21f626e367/dev-tools/scripts/cherrypick.sh#L154) | | dev-tools/scripts/cherrypick.sh | [185](https://github.com/apache/solr/blob/5884467f49024e2fa15eb51f77f04d21f626e367/dev-tools/scripts/cherrypick.sh#L185) | | dev-tools/scripts/cherrypick.sh | [207](https://github.com/apache/solr/blob/5884467f49024e2fa15eb51f77f04d21f626e367/dev-tools/scripts/cherrypick.sh#L207) | <p><a href="https://lift.sonatype.com/results/github.com/apache/solr/01GNT825EMV63AWZ6P5BHSYYB2?t=Shellcheck|SC2181" target="_blank">Visit the Lift Web Console</a> to find more details in your report.</p></div></details> --- <details><summary><b>âšī¸ Learn about @sonatype-lift commands</b></summary> You can reply with the following commands. For example, reply with ***@sonatype-lift ignoreall*** to leave out all findings. | **Command** | **Usage** | | ------------- | ------------- | | `@sonatype-lift ignore` | Leave out the above finding from this PR | | `@sonatype-lift ignoreall` | Leave out all the existing findings from this PR | | `@sonatype-lift exclude <file\|issue\|path\|tool>` | Exclude specified `file\|issue\|path\|tool` from Lift findings by updating your config.toml file | **Note:** When talking to LiftBot, you need to **refresh** the page to see its response. <sub>[Click here](https://github.com/apps/sonatype-lift/installations/new) to add LiftBot to another repo.</sub></details> --- Was this a good recommendation? [ [đ Not relevant](https://www.sonatype.com/lift-comment-rating?comment=365235666&lift_comment_rating=1) ] - [ [đ Won't fix](https://www.sonatype.com/lift-comment-rating?comment=365235666&lift_comment_rating=2) ] - [ [đ Not critical, will fix](https://www.sonatype.com/lift-comment-rating?comment=365235666&lift_comment_rating=3) ] - [ [đ Critical, will fix](https://www.sonatype.com/lift-comment-rating?comment=365235666&lift_comment_rating=4) ] - [ [đ Critical, fixing now](https://www.sonatype.com/lift-comment-rating?comment=365235666&lift_comment_rating=5) ] -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
![https://lift.sonatype.com/api/commentimage/fixrate/5/display.svg"](https://lift.sonatype.com/api/commentimage/fixrate/5/display.svg"){kind=link}