Skip to content

Commit 1e62b54

Browse files
committed
diff parse bug
1 parent bb4f5e3 commit 1e62b54

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

GLFileView.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,10 @@ + (NSString *)parseDiff:(NSString *)txt
297297
NSScanner *scan=[NSScanner scannerWithString:txt];
298298
NSString *block;
299299

300-
[scan scanUpToString:@"diff --git" intoString:NULL]; //move to first diff
300+
[scan scanUpToString:@"\ndiff --git" intoString:NULL]; //move to first diff
301301

302302
while([scan scanString:@"diff --git" intoString:NULL]){ // is a diff start?
303-
[scan scanUpToString:@"diff --git" intoString:&block];
303+
[scan scanUpToString:@"\ndiff --git" intoString:&block];
304304
[res appendString:[GLFileView parseDiffBlock:[NSString stringWithFormat:@"diff --git %@",block]]];
305305
}
306306

@@ -318,7 +318,7 @@ + (NSString *)parseDiffBlock:(NSString *)txt
318318
[res appendString:[GLFileView parseDiffHeader:block]];
319319
[res appendString:@"</td></tr></thead><tbody>"];
320320

321-
if([txt rangeOfString:@"Binary files"].location!=NSNotFound){
321+
if([block rangeOfString:@"Binary files"].location!=NSNotFound){
322322
[res appendString:[GLFileView parseBinaryDiff:block]];
323323
}
324324

0 commit comments

Comments
 (0)