Skip to content

Commit adee457

Browse files
Phlogistiqueclaude
andcommitted
Use SQUASH_COMMIT git ref instead of shell variable
This follows the script's design principle of using git refs where possible so logged commands are self-contained and reproducible. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 8cc3a4f commit adee457

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

update-pr-stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ update_direct_target() {
111111
log_cmd gh pr edit "$BRANCH" --add-label "$CONFLICT_LABEL"
112112
return 1
113113
else
114-
log_cmd git merge --no-edit -s ours "$SQUASH_COMMIT"
114+
log_cmd git merge --no-edit -s ours SQUASH_COMMIT
115115
log_cmd git update-ref MERGE_RESULT "HEAD^{tree}"
116116
COMMIT_MSG="Merge updates from $BASE_BRANCH and squash commit"
117117
CUSTOM_COMMIT=$(log_cmd git commit-tree MERGE_RESULT -p BEFORE_MERGE -p "origin/$MERGED_BRANCH" -p SQUASH_COMMIT -m "$COMMIT_MSG")

0 commit comments

Comments
 (0)