search

ldelossa / gh.nvim

A fully featured GitHub integration for performing code reviews in Neovim.
MIT License
544 stars 26 forks source link

Use base sha from pr data in file diff view #97

Closed GuillaumeLagrange closed 11 months ago

GuillaumeLagrange commented 11 months ago

Currently, in diff files, we use the parent commit of the first commit of the PR as the base ref for the diff view by files (!= commit).

When a PR is opened targeting a base branch (main), for a branch that is currently rebased on the target branch, the current diff for changed file is correct.

However, if the workflow is not to rebase on the base branch, but to merge the base branch into the PR branch, we see changes that are not included in the PR in the diff, because we are comparing with an old ref. This is because the parent commit of the first commit is an older commit of the base branch, so any change added to the base branch and merged into the target branch will be considered as part of the diff.

To mirror the diff we see on the web UI, using the sha from the pr data fixes this.

Here is a minimal repro of the issue that prompted this PR: https://github.com/GuillaumeLagrange/neoconf-repro/pull/2

GuillaumeLagrange commented 11 months ago

It seems to be closing #70