kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2012-04-26 10:35:25 -07:00
parent b4bd6bb356 e5e9b56528
commit 10a20b43c3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combine-diff.c
View File

@ -423,7 +423,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
hunk_begin, j); hunk_begin, j);
la = (la + context < cnt + 1) ? la = (la + context < cnt + 1) ?
(la + context) : cnt + 1; (la + context) : cnt + 1;
while (j <= --la) { while (la && j <= --la) {
if (sline[la].flag & mark) { if (sline[la].flag & mark) {
contin = 1; contin = 1;
break; break;