From: Junio C Hamano Date: Fri, 16 Apr 2010 16:56:11 GMT Subject: Re: Possible bug in Git Message-ID: <7vvdbrcp5g.fsf@alter.siamese.dyndns.org> In-Reply-To: Linus Torvalds writes: > I guess the issue is that combine-diff decides that there is nothing in > the result that isn't in either of the sources (because there is nothing > at all in the result), and as such it's not "interesting" after all. There was already a "fix" posted for the "empty vs missing" confusion. From: Thomas Rast Subject: [PATCH] combined diff: correctly handle truncated file Date: Thu, 15 Apr 2010 14:59:37 +0200 Message-ID: <884b9b68a4478aceda580299c059a9a67417cb1c.1271336073.git.trast@student.ethz.ch> I've been busy for the past few days, but I have it in my 'to-maint' queue. We may actually want to do the same for "missing" case as well, though.