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

PR revisions tab show more commits after being merged #2797

Closed
2 tasks done
deguif opened this issue Oct 27, 2017 · 4 comments · Fixed by #2937
Closed
2 tasks done

PR revisions tab show more commits after being merged #2797

deguif opened this issue Oct 27, 2017 · 4 comments · Fixed by #2937
Labels
Milestone

Comments

@deguif
Copy link

deguif commented Oct 27, 2017

Description

After merging a PR, the revisions tab on the PR page show more commits than when the PR was merged.
For example, in my case the PR had one commit in its revisions tab, once merged it got a lot more commits.

@lafriks
Copy link
Member

lafriks commented Oct 27, 2017

Can you provide steps to reproduce that?

@deguif
Copy link
Author

deguif commented Oct 28, 2017

Yes sure.
Just to confirm the issue, I reproduced it on https://try.gitea.io/deguif/test-pr-commits
That's since I upgraded to 1.2 that the bug appeared (previously I was using Gitea 1.1.0 before upgrading to 1.2).

Here the steps to reproduce:

    • Create a new branch with one commit and push it on the repository
    • Create a PR from this branch to the master branch
    • Add commits to master and push them
    • Merge previous PR
    • Commits that were not in the PR branch but that they were pushed to master, will appear on the PR.

Here the git history of master and PR branch before merging PR

  1. PR branch
* c79331c - (HEAD -> test-one-commit, origin/test-one-commit) Added one commit in the branch (François-Xavier de Guillebon 8 minutes ago)
* 6722783 - first commit (François-Xavier de Guillebon 11 minutes ago)
  1. Master branch
* 9cbf1c3 - (HEAD -> master, origin/master) Added test2.txt (François-Xavier de Guillebon 6 minutes ago)
* 5a82c4a - Added test1.txt (François-Xavier de Guillebon 7 minutes ago)
* 6722783 - first commit (François-Xavier de Guillebon 10 minutes ago)

@deguif deguif changed the title PR revision tabs show more commits after being merged PR revisions tab show more commits after being merged Oct 28, 2017
@lafriks lafriks added this to the 1.x.x milestone Oct 28, 2017
@lafriks
Copy link
Member

lafriks commented Oct 28, 2017

Thanks, confirmed

@deguif
Copy link
Author

deguif commented Nov 25, 2017

Thanks.

@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants