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 #3421] [MERGED] Fix PR merge error #16934

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

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/3421
Author: @ethantkoenig
Created: 1/28/2018
Status: ✅ Merged
Merged: 1/29/2018
Merged by: @lafriks

Base: master ← Head: fix/merge_pr

📝 Commits (2)

  • e4a5959 Fix PR merge error
  • 36d08b6 Merge branch 'master' into fix/merge_pr

📊 Changes

1 file changed (+1 additions, -5 deletions)

View changed files

📝 models/pull.go (+1 -5)

📄 Description

Fix a bug where we used to look for commits between the merge commit and base commit in the head repo (where the merge commit does not exist). This led to spurious error messages (e.g. see line 1069 of https://drone.gitea.io/go-gitea/gitea/3392/9)

🔄 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/3421 **Author:** [@ethantkoenig](https://github.com/ethantkoenig) **Created:** 1/28/2018 **Status:** ✅ Merged **Merged:** 1/29/2018 **Merged by:** [@lafriks](https://github.com/lafriks) **Base:** `master` ← **Head:** `fix/merge_pr` --- ### 📝 Commits (2) - [`e4a5959`](https://github.com/go-gitea/gitea/commit/e4a5959a5308c9029215f7d5e0739ecc2e17dfef) Fix PR merge error - [`36d08b6`](https://github.com/go-gitea/gitea/commit/36d08b68934dc3ad26aa7245d193e28603ab8db1) Merge branch 'master' into fix/merge_pr ### 📊 Changes **1 file changed** (+1 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `models/pull.go` (+1 -5) </details> ### 📄 Description Fix a bug where we used to look for commits between the merge commit and base commit in the head repo (where the merge commit does not exist). This led to spurious error messages (e.g. see line 1069 of https://drone.gitea.io/go-gitea/gitea/3392/9) --- <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:22:27 -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#16934
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?