Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Derived repo cannot be merged with original repo #26781

Closed
apnote opened this issue Aug 29, 2023 · 5 comments · Fixed by #26785
Closed

Derived repo cannot be merged with original repo #26781

apnote opened this issue Aug 29, 2023 · 5 comments · Fixed by #26785
Labels
type/bug

Comments

@apnote
Copy link

apnote commented Aug 29, 2023 •
edited
Loading

Description

Unable to find a branch of the original Repository in the derived Repository, But this feature is normal in v1.17.4。

image

Gitea Version

1.20.3

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

image

Git Version

No response

Operating System

No response

How are you running Gitea?

I run gitea through the Docker container，The command is as follows。

docker-compose.yaml

version: '3'
services:
  gitea:
    image: 'gitea/gitea:1.20.3'
    container_name: dev_gitea
    hostname: "dev_gitea"
    ports:
      - '8030:3000'
      - '8022:22'
    volumes:
      - /data/gitea:/data
      - /etc/localtime:/etc/localtime:ro
    links:
      - mysql
    depends_on:
      - mysql
    user: root
    privileged: true
    restart: always

Database

MySQL/MariaDB
@wxiaoguang wxiaoguang mentioned this issue Aug 29, 2023
Closed
@apnote
Copy link
Author

apnote commented Aug 29, 2023

OK，Thank you！

@apnote apnote closed this as completed Aug 29, 2023
@CaiCandong
Copy link
Member

CaiCandong commented Aug 29, 2023 •
edited
Loading

OK，Thank you！

Could I contact you via QQ to see how to reproduce the problem? @apnote
My QQ is 1290147055

@apnote
Copy link
Author

apnote commented Aug 29, 2023 •
edited
Loading

OK，Thank you！

Could I contact you via QQ to see how to reproduce the problem? @apnote My QQ is 1290147055

It seems that your QQ account cannot be searched

@CaiCandong
Copy link
Member

Give me your QQ account

@apnote
Copy link
Author

apnote commented Aug 29, 2023

Give me your QQ account

My QQ is 1025273272。

@apnote apnote changed the title Derived warehouse cannot be merged with original warehouse Derived repo cannot be merged with original repo Aug 29, 2023
@CaiCandong CaiCandong mentioned this issue Aug 29, 2023
Merged
lafriks pushed a commit that referenced this issue Aug 29, 2023
@CaiCandong
Fix being unable to use a repo that prohibits accepting PRs as a PR s…
c576b50 
…ource. (#26785)

## Description 
Sometimes, we need to use an upstream mirror repository to update the
current development repository, but mirror repositories are prohibited
from PR. It should not appear in `merge to,` but it can appear in `pull
from.`
Fix #24585 #26193 #26781
Related #24183

Many thanks to @apnote  for assisting me in reproducing this bug!

## ScreenShot
---
### Before

<img
src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312"
width="400px">

### After

<img
src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727"
width="400px">
@GiteaBot GiteaBot mentioned this issue Aug 29, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this issue Aug 29, 2023
@CaiCandong @GiteaBot
Fix being unable to use a repo that prohibits accepting PRs as a PR s…
b9742b3 
…ource. (go-gitea#26785)

## Description 
Sometimes, we need to use an upstream mirror repository to update the
current development repository, but mirror repositories are prohibited
from PR. It should not appear in `merge to,` but it can appear in `pull
from.`
Fix go-gitea#24585 go-gitea#26193 go-gitea#26781
Related go-gitea#24183

Many thanks to @apnote  for assisting me in reproducing this bug!

## ScreenShot
---
### Before

<img
src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312"
width="400px">

### After

<img
src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727"
width="400px">
lunny pushed a commit that referenced this issue Aug 29, 2023
@GiteaBot @CaiCandong
Fix being unable to use a repo that prohibits accepting PRs as a PR s…
3bab204 
…ource. (#26785) (#26790)

Backport #26785 by @CaiCandong

## Description 
Sometimes, we need to use an upstream mirror repository to update the
current development repository, but mirror repositories are prohibited
from PR. It should not appear in `merge to,` but it can appear in `pull
from.`
Fix #24585 #26193 #26781
Related #24183

Many thanks to @apnote  for assisting me in reproducing this bug!

## ScreenShot
---
### Before

<img
src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312"
width="400px">

### After

<img
src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963"
width="400px">

<img
src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727"
width="400px">

Co-authored-by: CaiCandong <50507092+CaiCandong@users.noreply.github.com>
@GiteaBot GiteaBot mentioned this issue Aug 29, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix being unable to use a repo that prohibits accepting PRs as a PR source. CaiCandong/gitea
2 participants
@apnote @CaiCandong