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.

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

[Branch View] show "Included" Tag if it is merged manualy or Cloned from default branch #7976

Closed
6543 opened this issue Aug 25, 2019 · 8 comments · Fixed by #8449
Closed
Labels
type/enhancement An improvement of existing functionality

Comments

@6543
Copy link
Member

6543 commented Aug 25, 2019

If a repository use pull request, the merged label is unusable. But for others with no pull request, merged label is very usable. I will find time to review your PR.

so if the last commit is includet in default branch and folowing commit on default branch has a message wich *[Mm]erge*<branch name>* then it is merged manualy and the merge flag sould also aperar

Originally posted by @6543 in #7454 (comment)

@lunny lunny added the type/enhancement An improvement of existing functionality label Aug 25, 2019
@6543
Copy link
Member Author

6543 commented Aug 25, 2019

EDIT: i try to implement a function called IsManualMerged ...

show at PR: #7979

@6543
Copy link
Member Author

6543 commented Aug 25, 2019

important question:

if a branch is 0 commits Ahead and at least 1 Behind default branch - indicates this a MERGE already?!?
@lunny @zeripath @sapk

becaue it would save a lot of lookups ... no need for new go routines

@lunny
Copy link
Member

lunny commented Aug 26, 2019

Maybe only 0 commits Ahead if it was just merged.

@6543
Copy link
Member Author

6543 commented Aug 26, 2019

Maybe only 0 commits Ahead if it was just merged.

no because a merge generates a merge-comit ... wich is only on the default branch ...

if we only check Ahead and and Behind, i know one "bug/miss info": if you create a branch at some point in default branch's history wich has now own commits ... but his should be rare and for this you normaly use tags! ...

@6543
Copy link
Member Author

6543 commented Aug 26, 2019

cc298fb is doing it the short way ...

Preview:


@6543
Copy link
Member Author

6543 commented Aug 27, 2019

Maybe only 0 commits Ahead if it was just merged.

if there is no commit between the branch to merge and the branch who is merged - without option --no-ff there is no merge commit ... you are right

@6543 6543 changed the title [Branch View] show Merge Tag if it is merged manualy [Branch View] show "Included" Tag if it is merged manualy or Cloned from default branch Oct 6, 2019
@6543
Copy link
Member Author

6543 commented Oct 6, 2019

smal notes I'll work with:

  • add new lable "Included" color:jelow
  • string wich tells: "this branch was manualy merged or is in some way already included in the default branch"
  • some code ...

@6543
Copy link
Member Author

6543 commented Oct 10, 2019

@lunny -> #8449

@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants