•  
      request #31575 Git Pull Request changes might be showing an erroneous diff
    Infos
    #31575
    Martin GOYOT (goyotm)
    2023-04-17 14:33
    2023-04-17 12:09
    33178
    Details
    Git Pull Request changes might be showing an erroneous diff

    In attachement, please find a Git repository to reproduce the issue. It has two branches, create a pull request to merge new-branch into main, this will show the issue.

    There are two branches with three commits each :

    • main

      • initial commit
      • a common change
      • a change on main only
    • new-branch

      • initial commit
      • a common change
      • a new branch change

    The only diverging commits are a change on main only and a new branch change. When creating a pull request to merge new-branch into main, it appears that the change section shows a diff of a new branch change against a common change instead of a new branch change against a change on main only.

    Hence, we get something that looks like:

     

    2548-image.png

    While we are expecting something that should look like:

    2549-image.png

    Empty
    Empty
    Empty
    • [ ] enhancement
    • [ ] internal improvement
    Empty
    Stage
    Martin GOYOT (goyotm)
    Closed
    2023-04-17
    Attachments
    References
    Referenced by request #31575

    Follow-ups

    User avatar
    Martin GOYOT (goyotm)2023-04-17 14:33

    closed because duplicate of request #31081 as stated by @tgerbet . Transfered the details there.


    • Status changed from New to Closed
    • Assigned to changed from None to Martin GOYOT (goyotm)
    • Close date set to 2023-04-17