github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-12 02:24:21 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[PR #1927] [MERGED] Fix errors caused by force push #16125

New Issue
Closed
opened 2025-11-02 12:02:53 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 12:02:53 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/1927
Author: @ethantkoenig
Created: 6/10/2017
Status: ✅ Merged
Merged: 6/11/2017
Merged by: @appleboy

Base: master ← Head: fix/force_push

📝 Commits (1)

  • 2178fcc Fix errors caused by force push

📊 Changes

1 file changed (+7 additions, -6 deletions)

View changed files

📝 models/repo.go (+7 -6)

📄 Description

Fixes #1157

Do git fetch origin, followed by git reset --hard origin/<branch> in UpdateLocalCopyBranch(..) instead of a pull. This accounts for the case where others have made force pushes to origin, and the local repository maintained by gitea contains commits that are no longer in origin.

/cc @geek1011

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/1927 **Author:** [@ethantkoenig](https://github.com/ethantkoenig) **Created:** 6/10/2017 **Status:** ✅ Merged **Merged:** 6/11/2017 **Merged by:** [@appleboy](https://github.com/appleboy) **Base:** `master` ← **Head:** `fix/force_push` --- ### 📝 Commits (1) - [`2178fcc`](https://github.com/go-gitea/gitea/commit/2178fcc3878ee3541d6390ec7006a706cc16e64a) Fix errors caused by force push ### 📊 Changes **1 file changed** (+7 additions, -6 deletions) <details> <summary>View changed files</summary> 📝 `models/repo.go` (+7 -6) </details> ### 📄 Description Fixes #1157 Do `git fetch origin`, followed by `git reset --hard origin/<branch>` in `UpdateLocalCopyBranch(..)` instead of a pull. This accounts for the case where others have made force pushes to origin, and the local repository maintained by gitea contains commits that are no longer in origin. /cc @geek1011 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:02:53 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#16125
Delete Branch "%!s()"

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?