Skip to content

short circuit if there is no change between source and destination branch #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abbiejones merged 2 commits into from
Apr 20, 2026
Merged

short circuit if there is no change between source and destination branch #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78df65
short circuit if there is no difference between source branch and des…
abbiejones Apr 20, 2026
fb4d7c3
apply copilot suggestions
abbiejones Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion merge/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,24 @@ git remote prune origin
failures=()

function open_and_merge_pull_request() {
local source_branch="${GITHUB_REF#refs/heads/}"

echo "DEBUG: making pull request from ${GITHUB_REF} to $1"

# if $1 branch does not exist origin
# if destination branch does not exist on origin
if [[ -z "$(git ls-remote origin "$1")" ]]; then
echo "Could not find expected branch '$1' on remote 'origin'"
Comment thread
abbiejones marked this conversation as resolved.
return 1
fi

# Skip no-op merges so identical branches do not fail PR creation with
# "No commits between ..." validation errors.
local ahead_commit
ahead_commit="$(git rev-list --max-count=1 "origin/$1..origin/${source_branch}")"

Comment thread
abbiejones marked this conversation as resolved.
if [[ -z "${ahead_commit}" ]]; then
echo "DEBUG: skipping merge of ${GITHUB_REF} into $1; ${source_branch} has no commits ahead of $1"
return 0
fi

# subshell with +e so we continue on errors
Expand Down
Loading