Skip to content

fix: fetch commands in squash-pr.sh #18053

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
ludamad merged 1 commit into from
Oct 29, 2025
Merged

fix: fetch commands in squash-pr.sh #18053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions scripts/merge-train/squash-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,12 @@ cd "$worktree_dir"
git config user.name "$pr_author"
git config user.email "$author_email"

# Save our current branch commits
# Save our current branch commit
original_head=$(git rev-parse HEAD)

# Deepen by 50 to ensure we have the base commit

# Fetch the base commit with depth
# Deepen our history for comparisons
git fetch --depth=200 origin "$base_sha"
git fetch --depth=200 origin "$base_sha"

# Fetch the base branch to ensure we have it
git fetch --depth=200 origin "$base_branch"

# Find the merge-base between our branch and the base branch
Expand Down
Loading