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

[PR #2137] [MERGED] Fix fast-forward PR bug #16254

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

📋 Pull Request Information

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

Base: release/v1.1 ← Head: backport/fix/merge_pr

📝 Commits (3)

  • 64b57ed Fix fast-forward PR bug
  • e6725e1 Don't ignore error in getMergeCommit (#1843)
  • 282a2e0 Merge branch 'release/v1.1' into backport/fix/merge_pr

📊 Changes

1 file changed (+12 additions, -3 deletions)

View changed files

📝 models/pull.go (+12 -3)

📄 Description

Backport of #1989.

cc @bkcsoft

🔄 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/2137 **Author:** [@ethantkoenig](https://github.com/ethantkoenig) **Created:** 7/11/2017 **Status:** ✅ Merged **Merged:** 7/11/2017 **Merged by:** [@appleboy](https://github.com/appleboy) **Base:** `release/v1.1` ← **Head:** `backport/fix/merge_pr` --- ### 📝 Commits (3) - [`64b57ed`](https://github.com/go-gitea/gitea/commit/64b57ed6f5a12849f59b8645761fc4ef91eb1d60) Fix fast-forward PR bug - [`e6725e1`](https://github.com/go-gitea/gitea/commit/e6725e1e33df249705bd3b255ab090ad9562f9d2) Don't ignore error in getMergeCommit (#1843) - [`282a2e0`](https://github.com/go-gitea/gitea/commit/282a2e0f631f6188c335cd8f4a02c4d1ad5eb8ce) Merge branch 'release/v1.1' into backport/fix/merge_pr ### 📊 Changes **1 file changed** (+12 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `models/pull.go` (+12 -3) </details> ### 📄 Description Backport of #1989. cc @bkcsoft --- <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:06:01 -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#16254
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?