pwntester / octo.nvim

Edit and review GitHub issues and pull requests from the comfort of your favorite editor

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

PR review shows misleading diff

Craige opened this issue · comments

Issue Description

PR review shows misleading diff between base and source branch.

Type: bug report

Describe what happened (or what feature you want)

It appears that the PR review diff is showing a diff between the base and source which includes changes on the base branch which not present included in the source. This is misleading, and makes it appear as if the PR is applying changes that it isn't. Correctly, Octo does pick up that you can not comment on these changes/hunks because they are not part of the actual PR.

Describe what you expected to happen

The PR review diff for each file should render the diff the same as the unified diff generated by :Octo pr changes, which is what GitHub shows on the Web UI and is correct.

How to reproduce it (as minimally and precisely as possible)

  1. Make two branches (A,B) off of a base branch at the same point in time.
  2. Make changes to file 1 in branch A, merge into base
  3. Make changes to file 1 in branch B, PR to base.
  4. Changes to file 1 from A appear inversely in the PR for B->base, making it appear as if B is doing more than it actually is.

Tell us your environment

NVIM v0.9.5
Octo @ 5646539
gh version 2.49.0
MacOS 14.1.1

Anything else we need to know?

Possibly same issue as #529.