fix: squash-pr.sh

Author: ludamad

scripts/merge-train/squash-pr.sh

@@ -21,9 +21,16 @@ pr_author=$(echo "$pr_info" | jq -r '.author.login')
 head_repo=$(echo "$pr_info" | jq -r '.headRepository.nameWithOwner')
 is_fork=$(echo "$pr_info" | jq -r '.isCrossRepository')
 
-# We'll use AztecBot as the committer
-author_name="AztecBot"
-author_email="[email protected]"
+# Get the PR author's name and email
+author_info=$(gh api "/users/$pr_author" --jq '{name: .name, email: .email}')
+author_name=$(echo "$author_info" | jq -r '.name // .login')
+# Use GitHub's noreply email format if no public email
+author_email=$(echo "$author_info" | jq -r '.email // empty')
+if [[ -z "$author_email" || "$author_email" == "null" ]]; then
+  # Get user ID for noreply email format
+  user_id=$(gh api "/users/$pr_author" --jq '.id')
+  author_email="${user_id}+${pr_author}@users.noreply.github.com"
+fi
 
 # Create a temporary worktree to do the squashing
 worktree_dir=$(mktemp -d)
@@ -58,11 +65,11 @@ merge_base=$(git merge-base "$original_head" "origin/$base_branch")
 # Get all commits between merge_base and HEAD, excluding merges
 authors_info=$(git log "$merge_base..$original_head" --no-merges --format='%an <%ae>' | sort -u)
 
-# Build Co-authored-by trailers
+# Build Co-authored-by trailers, excluding the main PR author
 co_authors=""
 while IFS= read -r author_line; do
-  # Skip empty lines and AztecBot itself
-  if [[ -n "$author_line" ]] && [[ "$author_line" != *"AztecBot"* ]] && [[ "$author_line" != *"[email protected]"* ]]; then
+  # Skip empty lines, the main PR author, AztecBot, and [email protected]
+  if [[ -n "$author_line" ]] && [[ "$author_line" != *"$author_name"* ]] && [[ "$author_line" != *"$author_email"* ]] && [[ "$author_line" != *"AztecBot"* ]] && [[ "$author_line" != *"[email protected]"* ]]; then
     co_authors="${co_authors}Co-authored-by: ${author_line}
 "
   fi