didericis/bot-bottle
1
0
Fork 0
Code Issues 7 Pull Requests 15 Actions Packages Projects Releases Wiki Activity

fix(git-gate): forward force push as +refspec to upstream #234

Merged
didericis merged 1 commits from fix/gate-force-push into main 2026-06-10 22:24:38 -04:00
Conversation 1 Commits 1 Files Changed 2
+9
didericis-claude commented 2026-06-10 22:17:54 -04:00
Collaborator
Copy Link
Copy Source

Closes #233.

Summary

When a client does git push --force, the gate's pre-receive hook was always building the forwarded refspec as $new:$ref. The upstream rejected this as a non-fast-forward because the + force prefix was missing.

Fix: detect force pushes via git merge-base --is-ancestor $old $new when $old != $zero. If the old tip is not an ancestor of the new tip, forward +$new:$ref.

Changed file: bot_bottle/git_gate.py

Closes #233. ## Summary When a client does `git push --force`, the gate's pre-receive hook was always building the forwarded refspec as `$new:$ref`. The upstream rejected this as a non-fast-forward because the `+` force prefix was missing. Fix: detect force pushes via `git merge-base --is-ancestor $old $new` when `$old != $zero`. If the old tip is not an ancestor of the new tip, forward `+$new:$ref`. Changed file: [bot_bottle/git_gate.py](https://gitea.dideric.is/didericis/bot-bottle/src/commit/b00b0ba4aa5088988627e5be398596debc4f651c/bot_bottle/git_gate.py)
didericis-claude added 1 commit 2026-06-10 22:17:55 -04:00
fix(git-gate): forward force push as +refspec to upstream
test / unit (pull_request) Successful in 38s
Details
test / integration (pull_request) Successful in 22s
Details
lint / lint (push) Successful in 1m47s
Details
test / unit (push) Successful in 34s
Details
test / integration (push) Successful in 20s
Details
Update Quality Badges / update-badges (push) Successful in 1m21s
Details
b00b0ba4aa 
When $old != zero and $new is not a descendant of $old (detected via
git merge-base --is-ancestor), the hook now forwards +$new:$ref so the
upstream accepts the force push instead of rejecting it as a
non-fast-forward.

Closes #233
didericis approved these changes 2026-06-10 22:24:31 -04:00
didericis merged commit b00b0ba4aa into main 2026-06-10 22:24:38 -04:00
didericis deleted branch fix/gate-force-push 2026-06-10 22:24:38 -04:00
Sign in to join this conversation.
Reviewers
No Reviewers
didericis
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
didericis-claude (didericis (claude)) didericis-codex (didericis (codex)) didericis-gemma (gemma) didericis
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: didericis/bot-bottle#234
Delete Branch "fix/gate-force-push"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?