@matheusbsbs / matheus-bagliano / commits / 66399eff86
Fork 0

gitweb: Fix errors in git_patchset_body for empty patches

We now do not skip over empty patches in git_patchset_body (where empty means that they consist only of git diff header, and of extended diff header, for example "pure rename" patch). This means that after extended diff header there can be next patch (i.e. /^diff /) or end of patchset, and not necessary patch body (i.e. /^--- /). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Jan 7, 2007 at 02:52 UTC 66399eff86555fce52dc7b54829f02e4bb2424b7
1 file changed +3 -1
gitweb/gitweb.perl
+3 -1
@@ -2403,7 +2403,7 @@ sub git_patchset_body {
2403 while ($patch_line = <$fd>) {
2404 chomp $patch_line;
2405
2406 - last EXTENDED_HEADER if ($patch_line =~ m/^--- /);
2406 + last EXTENDED_HEADER if ($patch_line =~ m/^--- |^diff /);
2407
2408 if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
2409 $from_id = $1;
@@ -2522,6 +2522,8 @@ sub git_patchset_body {
2522
2523 # from-file/to-file diff header
2524 $patch_line = $last_patch_line;
2525 + last PATCH unless $patch_line;
2526 + next PATCH if ($patch_line =~ m/^diff /);
2527 #assert($patch_line =~ m/^---/) if DEBUG;
2528 if ($from{'href'}) {
2529 $patch_line = '--- a/' .