refs/pull/XXX/merge might not work?

[tetsuharuohzeki]

Code

• here:

  popuko/operation/branch.go

  Lines 19 to 22 in 7d867d3

  	// see:
  	// https://github.com/voyagegroup/popuko/issues/93
  	// https://help.github.com/articles/checking-out-pull-requests-locally/
  	base := fmt.Sprintf("refs/pull/%d/merge", number)

• https://help.github.com/articles/checking-out-pull-requests-locally/ does not mention about refs/pull/XXX/merge

Other mentions

https://blog.bitrise.io/git-clone-step-revision

Update your Git Clone step to 4.0.5 (or higher) as we had it totally rewritten to make it more concise, stable and reliable. Plus it'll be easier to contribute to it in case a new feature is needed. ✨

In case of a Pull Request on GitHub, we cloned the pull request merge branch provided by GitHub (pull//merge), but we had multiple reports of Bitrise using an older state of code without the updates when a build was triggered. This was caused by GitHub's practice of not updating this special branch with every new incoming code update.

https://discuss.bitrise.io/t/git-clone-step-merge-happens-when-manual-merge-is-no/4436

Originally we used the github provided pull/X/merge directly, which includes the pre-merged code directly, but due to recent changes on how/when github updates that branch we had to change that. In short, in the past if you pushed a code change to an open PR the /merge branch was auto updated by github, every time. A couple of months ago github changed this and it’ll now only update the /merge branch if you actually visit the page on the web UI. This means that there’s no point in testing /merge as it might be outdated.

[tetsuharuohzeki]

It might be better to revert #156

[tetsuharuohzeki]

@nekoya do you have any trouble?

[nekoya]

Fmmmm, I don't recognize such troubles in these days.

[tetsuharuohzeki]

It might be better to revert #156

The revert is easy. But it would reproduce #140.
To avoid it, we should create auto.tmp or similar tmp branch and ignore it from CI. However, it requires to add auto.tmp as ignored branch for their CI configuration if they uses auto merging.