From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [PATCH] Fix apply --recount handling of no-EOL line Date: Fri, 4 Jul 2008 20:34:17 +0100 (BST) Message-ID: References: <1215198614-22148-1-git-send-email-trast@student.ethz.ch> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org, Junio C Hamano To: Thomas Rast X-From: git-owner@vger.kernel.org Fri Jul 04 21:37:15 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KEr5n-000118-4G for gcvg-git-2@gmane.org; Fri, 04 Jul 2008 21:37:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751139AbYGDTgL (ORCPT ); Fri, 4 Jul 2008 15:36:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751567AbYGDTgL (ORCPT ); Fri, 4 Jul 2008 15:36:11 -0400 Received: from mail.gmx.net ([213.165.64.20]:56148 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750976AbYGDTgK (ORCPT ); Fri, 4 Jul 2008 15:36:10 -0400 Received: (qmail invoked by alias); 04 Jul 2008 19:36:08 -0000 Received: from grape.st-and.ac.uk (EHLO grape.st-and.ac.uk) [138.251.155.28] by mail.gmx.net (mp002) with SMTP; 04 Jul 2008 21:36:08 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1/4fI9Kp/X4YAIytuqk8aMOEr/qtMmmroK62NZHea YpGgwTt/olyqXB X-X-Sender: gene099@racer In-Reply-To: <1215198614-22148-1-git-send-email-trast@student.ethz.ch> User-Agent: Alpine 1.00 (DEB 882 2007-12-20) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.67 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Fri, 4 Jul 2008, Thomas Rast wrote: > If a patch modifies the last line of a file that previously had no > terminating '\n', it looks like > > -old text > \ No newline at end of file > +new text Oh! > Hence, a '\' line does not signal the end of the hunk. This modifies > 'git apply --recount' to take this into account. > > Signed-off-by: Thomas Rast ACK! Ciao, Dscho