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
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
"/home/tris/Projects/go/src/code.gitea.io/gitea/gitea" hook --config='/home/tris/Projects/go/src/code.gitea.io/gitea/custom/conf/app.ini' post-receive
"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" post-receive
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
"/home/tris/Projects/go/src/code.gitea.io/gitea/gitea" hook --config='/home/tris/Projects/go/src/code.gitea.io/gitea/custom/conf/app.ini' pre-receive
"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" pre-receive
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
"/home/tris/Projects/go/src/code.gitea.io/gitea/gitea" hook --config='/home/tris/Projects/go/src/code.gitea.io/gitea/custom/conf/app.ini' update $1 $2 $3
"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" update $1 $2 $3
@@ -0,0 +1 @@
x•ŽAnÃ0 sÖ+ø”l Ð[_ATkIJC>ø÷Õz[,f1›·Zç!øKÛÍ€“èL5[,©DÒ‰':aˆRнe·µÁDlã È:^Cg”lHƒdæ‡Â>iqr´ßm‡ïs1ø‚ÛKº­m=?Uæå3oõž˜®òðÑõ¶¿köß{ª‚@wÔʼ˜ûE]
@@ -0,0 +1,2 @@
x•ÎA
Â0@Q×9Å\@™NÒ&wž"“L´Ø4Ò¦‚·×+¸ýðàÇZÊØ€ˆvm`ÉÙ!&ÇuÖŽmò¾÷FKÇl³·aÈê8t¨]¢l;ÆÀHè}g´9'2}´{*líQ¸}&+Ÿi+unóv¾—0N‡XË ºÁŽ,!Â{Dõ«¿»&ÿ:uI š¬
@@ -0,0 +1,3 @@
x•ŽAnÂ0EYűs=v2FB v=D5¶';UTâöř
Ýţ§÷ôóZ묀ş‰€%›P(z“—ŁźŠpńDě%8¶!8[Ě/oŇrďR¦1FępŔHS.¦”┞3÷$’á]ëßďEŕ—gŮëÚ´í×{ĺy9ĺµ~{ ĎŽv°ÖôµżSůŻgn˛
¨Ľô”_Ŕ­Ŕ2·çĎc6tuI‚
@@ -0,0 +1 @@
c8e31bc7688741a5287fcde4fbb8fc129ca07027
@@ -0,0 +1 @@
cfe3b3c1fd36fba04f9183287b106497e1afe986
@@ -0,0 +1 @@
8babce967f21b9dfa6987f943b91093dac58a4f0