Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Attempt to detect cherrypick remote if not specified (#569)

Mike Drob7d92d3979754
diff --git a/dev-tools/scripts/cherrypick.sh b/dev-tools/scripts/cherrypick.sh
index e71ff45ceb3..b3902ccd157 100755
--- a/dev-tools/scripts/cherrypick.sh
+++ b/dev-tools/scripts/cherrypick.sh
@@ -196,15 +196,19 @@ for BRANCH in "${BRANCHES[@]}"; do
LOG "WARN" "Cannot auto push if tests are disabled"
exit 1
fi
+ if [[ -z "$REMOTE" ]]; then
+ LOG "WARN" "Remote not specified, attempting to auto detect"
+ REMOTE=$(git config --get "branch.$BRANCH.remote")
+ fi
LOG "INFO" "Pushing changes to $REMOTE/$BRANCH"
# shellcheck disable=SC2086
$GIT_COMMAND push $REMOTE $BRANCH
if [ $? -gt 0 ]; then
- LOG "WARN" "PUSH to $REMOTE/$BRANCH failed, please clean up an proceed manually"
+ LOG "WARN" "PUSH to $REMOTE/$BRANCH failed, please clean up and proceed manually"
exit 2
fi
LOG "INFO" "Pushed $BRANCH to remote. Cherry-pick complete."
fi
done
-LOG "INFO" "SUCCESS on branches ${BRANCHES[*]} for commits ${COMMITS[*]}"
\ No newline at end of file
+LOG "INFO" "SUCCESS on branches ${BRANCHES[*]} for commits ${COMMITS[*]}"