From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:35:25 +0000 (-0700)
Subject: Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint
X-Git-Tag: v1.7.10.1~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10a20b43c3d03ea1fab9095f96eda66086d3dcd2?hp=b4bd6bb356795ef817d44d65c16bba7f192ab29e

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

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) has been
fixed.

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;