Learn more about these different git repos.
Other Git URLs
Pagure told me it that PR156 for koji could be fast-forwarded, so I clicked the merge button. However, there was no fast forward. The branch was merged, resulting in the sort of branch tangle that I try to avoid.
https://pagure.io/koji/pull-request/156
<img alt="Screenshot_from_2016-09-28_17-59-34.png" src="/pagure/issue/raw/files/7cfc52754bffd9e92fd19b0e161a4bf4f0e4c916ac5d5c24c02212b90c84feaf-Screenshot_from_2016-09-28_17-59-34.png" />
hm, so the merge status of a PR is cached so that it's not regenerated every time the page is loaded, we clear this cache when a PR is merged.
Do you remember what preceded this merge? I wonder if there isn't a situation where we are not removing the cache while we should.
I think it happens after direct push to the repo. I have a PR on my test repo that says fast forward is possible, but clicking the button complains about merge conflicts: https://pagure.io/lsedlar-test-playground/pull-request/3
It was fast-forwardable, but then I pushed a commit on the target branch. The button is still green, but it should be red.
I think it happens after direct push to the repo. I have a PR on my test repo that says fast forward is possible, but clicking the button complains about merge conflicts
I am also suspecting something like this. The fix for this is however to install a git hook to all the repos that would clear all status of opened PR upon push.
Definitely doable, but does imply enforcing a hook to all the repo which we managed to avoid so far.
Yes, the previous commit was from a manual push.
This should be fix by setting up a default hook doing this (for the moment).
PR at: https://pagure.io/pagure/pull-request/1391
Fixed by the PR above.
@pingou changed the status to Fixed
Fixed
Login to comment on this ticket.