From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Shawn O. Pearce" Subject: [JGIT PATCH 08/12] Fix HunkHeader start line when parsing "@@ -1 +1 @@" style headers Date: Fri, 12 Dec 2008 14:05:54 -0800 Message-ID: <1229119558-1293-9-git-send-email-spearce@spearce.org> References: <1229119558-1293-1-git-send-email-spearce@spearce.org> <1229119558-1293-2-git-send-email-spearce@spearce.org> <1229119558-1293-3-git-send-email-spearce@spearce.org> <1229119558-1293-4-git-send-email-spearce@spearce.org> <1229119558-1293-5-git-send-email-spearce@spearce.org> <1229119558-1293-6-git-send-email-spearce@spearce.org> <1229119558-1293-7-git-send-email-spearce@spearce.org> <1229119558-1293-8-git-send-email-spearce@spearce.org> Cc: git@vger.kernel.org To: Robin Rosenberg X-From: git-owner@vger.kernel.org Fri Dec 12 23:08:26 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 1LBGBI-0004x0-As for gcvg-git-2@gmane.org; Fri, 12 Dec 2008 23:08:20 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755088AbYLLWGe (ORCPT ); Fri, 12 Dec 2008 17:06:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754934AbYLLWGc (ORCPT ); Fri, 12 Dec 2008 17:06:32 -0500 Received: from george.spearce.org ([209.20.77.23]:50685 "EHLO george.spearce.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754451AbYLLWGI (ORCPT ); Fri, 12 Dec 2008 17:06:08 -0500 Received: by george.spearce.org (Postfix, from userid 1000) id 4F8AA38262; Fri, 12 Dec 2008 22:06:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on george.spearce.org X-Spam-Level: X-Spam-Status: No, score=-4.4 required=4.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.4 Received: from localhost.localdomain (localhost [127.0.0.1]) by george.spearce.org (Postfix) with ESMTP id E188C38215; Fri, 12 Dec 2008 22:06:00 +0000 (UTC) X-Mailer: git-send-email 1.6.1.rc2.306.ge5d5e In-Reply-To: <1229119558-1293-8-git-send-email-spearce@spearce.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In this case we are listing a delta of 1 line but also the position start is line 1. Signed-off-by: Shawn O. Pearce --- .../src/org/spearce/jgit/patch/HunkHeader.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java b/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java index 842519e..f543aed 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java +++ b/org.spearce.jgit/src/org/spearce/jgit/patch/HunkHeader.java @@ -152,18 +152,14 @@ void parseHeader(final int end) { old.startLine = -parseBase10(buf, ptr.value, ptr); if (buf[ptr.value] == ',') old.lineCount = parseBase10(buf, ptr.value + 1, ptr); - else { - old.lineCount = old.startLine; - old.startLine = 0; - } + else + old.lineCount = 1; newStartLine = parseBase10(buf, ptr.value + 1, ptr); if (buf[ptr.value] == ',') newLineCount = parseBase10(buf, ptr.value + 1, ptr); - else { - newLineCount = newStartLine; - newStartLine = 0; - } + else + newLineCount = 1; } int parseBody(final Patch script, final int end) { -- 1.6.1.rc2.306.ge5d5e