Hey Jim, The patches look fine to me, although I don't know the source of diff3 well enough to be a good reviewer. I've tested the patches a bit and everything seems to be OK. Thanks for fixing this issue.
Cheers Bastian Am 15.08.2016 02:14 schrieb "Jim Meyering" <j...@meyering.net>: > On Sat, Aug 13, 2016 at 10:14 PM, Jim Meyering <j...@meyering.net> wrote: > > On Fri, Aug 12, 2016 at 9:35 AM, Jim Meyering <j...@meyering.net> wrote: > >> On Fri, Aug 12, 2016 at 7:22 AM, Bastian Beischer > >> <bastian.beisc...@rwth-aachen.de> wrote: > >>> Hello, > >>> > >>> Please try to run diff3 from diffutils 3.4 as follows: > >>> > >>> echo a > a.txt > >>> echo b > b.txt > >>> echo c > c.txt > >>> diff3 a.txt b.txt c.txt > > ... > >>> There was only one commit in src/diff3.c between 3.3 and 3.4: > >>> > >>> http://git.savannah.gnu.org/cgit/diffutils.git/commit/src?id= > 3b74a905c5460e7979c53273ac90345860d001a7 > >>> > >>> Reverting this commit fixes the issue. > >> > >> Yikes. > >> Thank you for the report. > >> I confirm that that patch is erroneous, and will prepare a complete > >> fix (adding your test and a NEWS entry) shortly. > >> Looks like diffutils-3.5 will have to be released pretty soon. > > > > I've reverted that, added your test case and updated NEWS with a > > commit in your name. Please review that first commit, in the attached. > ... > Normally I would be more patient in waiting for your review, but I'm > in a hurry to make diffutils-3.5, so have just pushed those, and am > now preparing a pre-release snapshot. >
