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

New Issue

GiteaMirror · 2025-11-02T05:27:57-06:00

GiteaMirror commented

2025-11-02 05:27:57 -06:00

Originally created by @6543 on GitHub (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 https://github.com/go-gitea/gitea/issues/7454#issuecomment-524643249

Originally created by @6543 on GitHub (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 https://github.com/go-gitea/gitea/issues/7454#issuecomment-524643249_

GiteaMirror added the type/enhancement label 2025-11-02 05:27:57 -06:00

GiteaMirror closed this issue

2025-11-02 05:27:57 -06:00

GiteaMirror commented

2025-11-02 05:27:58 -06:00

@6543 commented on GitHub (Aug 25, 2019):

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

show at PR: https://github.com/go-gitea/gitea/pull/7979

@6543 commented on GitHub (Aug 25, 2019): EDIT: i try to implement a function called IsManualMerged ... show at PR: https://github.com/go-gitea/gitea/pull/7979

GiteaMirror commented

2025-11-02 05:27:58 -06:00

@6543 commented on GitHub (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

@6543 commented on GitHub (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

GiteaMirror commented

2025-11-02 05:27:58 -06:00

@lunny commented on GitHub (Aug 26, 2019):

Maybe only 0 commits Ahead if it was just merged.

@lunny commented on GitHub (Aug 26, 2019): Maybe only 0 commits Ahead if it was just merged.

GiteaMirror commented

2025-11-02 05:27:59 -06:00

@6543 commented on GitHub (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 commented on GitHub (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! ...

GiteaMirror commented

2025-11-02 05:27:59 -06:00

@6543 commented on GitHub (Aug 26, 2019):

cc298fbac8 is doing it the short way ...

Preview:

@6543 commented on GitHub (Aug 26, 2019): https://github.com/go-gitea/gitea/pull/7979/commits/cc298fbac8c6b8808e08d0abb2652d8041eaa609 is doing it the short way ... ## Preview: ![](https://cloud.obermui.de/apps/gallery/preview.public/1456972?width=1600&height=1600&c=c7ce1aab93c94643af28760b2ebf6109&requesttoken=Xk0OmCixOpJuOZJfw4oVa6QQxur%2BuxfcPoKyUbd2RTc%3D%3AKWY412TJAvMvCsEw6LIsP%2BZCiNqvyEGlEe7qev0cJFI%3D&token=bG6GeSa6kqCQ2f3) ![](https://cloud.obermui.de/apps/gallery/preview.public/1456971?width=1600&height=1600&c=16da7eaff86c20f137c1e330168522f7&requesttoken=Xk0OmCixOpJuOZJfw4oVa6QQxur%2BuxfcPoKyUbd2RTc%3D%3AKWY412TJAvMvCsEw6LIsP%2BZCiNqvyEGlEe7qev0cJFI%3D&token=bG6GeSa6kqCQ2f3)

GiteaMirror commented

2025-11-02 05:27:59 -06:00

@6543 commented on GitHub (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 commented on GitHub (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

GiteaMirror commented

2025-11-02 05:27:59 -06:00

@6543 commented on GitHub (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 commented on GitHub (Oct 6, 2019): smal notes I'll work with: * [x] add new lable "Included" color:jelow * [x] string wich tells: "this branch was manualy merged or is in some way already included in the default branch" * [x] some code ...

GiteaMirror commented

2025-11-02 05:28:00 -06:00

@6543 commented on GitHub (Oct 10, 2019):

@lunny -> https://github.com/go-gitea/gitea/pull/8449

@6543 commented on GitHub (Oct 10, 2019): @lunny -> https://github.com/go-gitea/gitea/pull/8449

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#3843