gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 55ef72d266a75a0b327a8eb1cf786c65cf369a0d268bb25f27337fb3d55651e3..67a6b263501e3cc7077c72437254ce5166ec607101612807e2a94d720d378010 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1496,6 +1496,17 @@ sub parse_difftree_raw_line {
                        $res{'file'} = unquote($7);
                }
        }
+       # '::100755 100755 100755 60e79ca1b01bc8b057abe17ddab484699a7f5fdb 94067cc5f73388f33722d52ae02f44692bc07490 94067cc5f73388f33722d52ae02f44692bc07490 MR git-gui/git-gui.sh'
+       # combined diff (for merge commit)
+       elsif ($line =~ s/^(::+)((?:[0-7]{6} )+)((?:[0-9a-fA-F]{40} )+)([a-zA-Z]+)\t(.*)$//) {
+               $res{'nparents'}  = length($1);
+               $res{'from_mode'} = [ split(' ', $2) ];
+               $res{'to_mode'} = pop @{$res{'from_mode'}};
+               $res{'from_id'} = [ split(' ', $3) ];
+               $res{'to_id'} = pop @{$res{'from_id'}};
+               $res{'status'} = [ split('', $4) ];
+               $res{'to_file'} = unquote($5);
+       }
        # 'c512b523472485aef4fff9e57b229d9d243c967f'
        elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
                $res{'commit'} = $1;