From: Tom Lane <tgl@sss.pgh.pa.us>
To: Jelte Fennema-Nio <postgres@jeltef.nl>
cc: vignesh C <vignesh21@gmail.com>,
        PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>,
        Jacob Brazeal <jacob.brazeal@gmail.com>
Subject: Re: Commitfest app release on Feb 17 with many improvements
In-reply-to: <CAGECzQSE7igwsTUk17i+RNEUL1zR-Zkp-1Zs7KkhmBxAu_Fksw@mail.gmail.com>
References: <CAGECzQTbHhaZMY-=Y=OGMU_jik4MqCfsc7rDf6AnT=Aq-B6cZA@mail.gmail.com> <CALDaNm3ta7UV_eD+ObgVsivGgPZSj1YqnO4-ojeBz10J95u7_A@mail.gmail.com> <CAGECzQSE7igwsTUk17i+RNEUL1zR-Zkp-1Zs7KkhmBxAu_Fksw@mail.gmail.com>
Comments: In-reply-to Jelte Fennema-Nio <postgres@jeltef.nl>
	message dated "Thu, 06 Mar 2025 17:00:52 +0100"
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <703818.1741281033.1@sss.pgh.pa.us>
Date: Thu, 06 Mar 2025 12:10:33 -0500
Message-ID: <703819.1741281033@sss.pgh.pa.us>
Archived-At: <https://www.postgresql.org/message-id/703819.1741281033%40sss.pgh.pa.us>
Precedence: bulk

Jelte Fennema-Nio <postgres@jeltef.nl> writes:
> Okay, the cause of this seems to be that the CFbot currently uses "git
> apply --3way", not "git am --3way". For some reason "git apply" fails
> to apply the patch while "git am" succeeds. I'll check this weekend if
> I can change the logic to use "git am" instead.

Please see if you can make it use patch(1).  IME git is too
stiff-necked about slightly stale patches no matter which
subcommand you use.

			regards, tom lane