mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-04-16 12:41:59 -07:00
parent c0599f6993 e5e9b56528
commit f84e8b6069
1 changed files with 1 additions and 1 deletions
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;