From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:41:59 +0000 (-0700)
Subject: Merge branch 'rs/combine-diff-zero-context-at-the-beginning'
X-Git-Tag: v1.7.11-rc0~150
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f84e8b6069e87230bf4d13f845748c58d599c572?hp=c0599f6993413360d8e35679a6b421d4eb16a698

Merge branch 'rs/combine-diff-zero-context-at-the-beginning'

Fixes an age old corner case bug in combine diff (only triggered with -U0
and the hunk at the beginning of the file needs to be shown).

By René Scharfe
* rs/combine-diff-zero-context-at-the-beginning:
combine-diff: fix loop index underflow
---

diff --git a/combine-diff.c b/combine-diff.c
index a2e8dcf855..9786680368 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -423,7 +423,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
 						     hunk_begin, j);
 				la = (la + context < cnt + 1) ?
 					(la + context) : cnt + 1;
-				while (j <= --la) {
+				while (la && j <= --la) {
 					if (sline[la].flag & mark) {
 						contin = 1;
 						break;