b72a46db68
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree with a 3-file patch applied (no upstream history). Patch (crates/gpui_linux/src/linux/wayland/): - serial.rs: add SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; add latest_serial_of() - window.rs: activate() uses keyboard-enter serial (Mutter focus gate) Mutter honors window activation only when the token carries the keyboard- focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial. See docs/tray-window-focus-wayland.md in logiguard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
34 lines
1.0 KiB
Plaintext
Executable File
34 lines
1.0 KiB
Plaintext
Executable File
# #!/bin/bash
|
|
set -euxo pipefail
|
|
|
|
if [ "$#" -ne 3 ]; then
|
|
echo "Usage: $0 <branch-name> <commit-sha> <channel>"
|
|
exit 1
|
|
fi
|
|
|
|
BRANCH_NAME="$1"
|
|
COMMIT_SHA="$2"
|
|
CHANNEL="$3"
|
|
|
|
SHORT_SHA="${COMMIT_SHA:0:8}"
|
|
NEW_BRANCH="cherry-pick-${BRANCH_NAME}-${SHORT_SHA}"
|
|
git fetch --depth 2 origin +${COMMIT_SHA} ${BRANCH_NAME}
|
|
git checkout --force "origin/$BRANCH_NAME" -B "$NEW_BRANCH"
|
|
|
|
git cherry-pick "$COMMIT_SHA"
|
|
|
|
git push origin -f "$NEW_BRANCH"
|
|
COMMIT_TITLE=$(git log -1 --pretty=format:"%s" "$COMMIT_SHA")
|
|
COMMIT_BODY=$(git log -1 --pretty=format:"%b" "$COMMIT_SHA")
|
|
|
|
# Check if commit title ends with (#number)
|
|
if [[ "$COMMIT_TITLE" =~ \(#([0-9]+)\)$ ]]; then
|
|
PR_NUMBER="${BASH_REMATCH[1]}"
|
|
PR_BODY="Cherry-pick of #${PR_NUMBER} to ${CHANNEL}"$'\n'$'\n'"----"$'\n'"${COMMIT_BODY}"
|
|
else
|
|
PR_BODY="Cherry-pick of ${COMMIT_SHA} to ${CHANNEL}"$'\n'$'\n'"----"$'\n'"${COMMIT_BODY}"
|
|
fi
|
|
|
|
# Create a pull request
|
|
gh pr create --base "$BRANCH_NAME" --head "$NEW_BRANCH" --title "$COMMIT_TITLE (cherry-pick to $CHANNEL)" --body "$PR_BODY"
|