1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

Use beforeCommit instead of baseCommit (#22949)

Replaces: https://github.com/go-gitea/gitea/pull/22947
Fixes https://github.com/go-gitea/gitea/issues/22946
Probably related to https://github.com/go-gitea/gitea/issues/19530

Basically, many of the diffs were broken because they were comparing to
the base commit, where a 3-dot diff should be comparing to the [last
common
ancestor](https://matthew-brett.github.io/pydagogue/git_diff_dots.html).

This should have an integration test so that we don’t run into this
issue again.

---------

Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
This commit is contained in:
Kyle D
2023-02-19 20:56:07 -07:00
committed by GitHub
parent 6840a8ccfc
commit 2b3f12f6fd
20 changed files with 110 additions and 11 deletions

View File

@@ -0,0 +1 @@
x<01><>An<41>0 s<>+<2B><><16>l<EFBFBD> <09>[_A<5F>TkIJC><3E><><EFBFBD>z[,f1<66><31>Z<EFBFBD>!<21>K<EFBFBD>̀<EFBFBD><CD80>S<><53>L5[,<14>'<27>:a<>Rнe<D0BD><65><EFBFBD>Dl<44> <20>:^C<0F>g<EFBFBD>lH<6C>d<EFBFBD><64><EFBFBD><EFBFBD>>iqr<71><72>m<EFBFBD><6D>s1<73><31><EFBFBD>K<EFBFBD><4B><EFBFBD>m=?U<><55>3o<33><0E><><EFBFBD><EFBFBD><07><><EFBFBD><11><><EFBFBD><EFBFBD>k<EFBFBD>ߝ{<7B><>@w<>ʼ<><CABC><03>E]