On Thu, 6 Mar 2025 at 21:24, Tom Lane <t...@sss.pgh.pa.us> wrote: > > vignesh C <vignes...@gmail.com> writes: > > On Wed, 5 Mar 2025 at 16:50, Jim Jones <jim.jo...@uni-muenster.de> wrote: > >> Is there something wrong with the commitfest app? This patch applies > >> cleanly and passes all tests > > > I verified that it applies neatly and passes the tests for me too, I > > have reported this issue at [1]. I don't know the reason for this. > > What did you apply with? "git am" is known to be far pickier than > "patch". (I thought the cfbot was using "patch", but I might be > wrong. There are many versions of "patch", too.)
In my local environment I used "git am" and it worked fine. cfbot has used "git apply --3way" as per [1], they are planning to change it to "git am" to fix this issue. [1] - https://www.postgresql.org/message-id/CAGECzQSE7igwsTUk17i%2BRNEUL1zR-Zkp-1Zs7KkhmBxAu_Fksw%40mail.gmail.com Regards, Vignesh