| commit | 78bc403aaffe4dc7854da118e977685b38bdc5b7 | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Sun, 6 May 2007 23:10:03 +0000 (7 01:10 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 8 May 2007 01:20:18 +0000 (7 18:20 -0700) | ||
| tree | 04a0de5ec88d825a792bf145e2c5117ffcd657ed | treesnapshot (tar.gz zip) |
| parent | 3082acfa7c626a34aa419a163585051c2df2bf09 | commitdiff |
gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
Add parsing line of raw combined diff ("git diff-tree -c/-cc" output)
as described in section "diff format for merges" in diff-format.txt
to parse_difftree_raw_line subroutine.
Returned hash (or hashref) has for combined diff 'nparents' key which
holds number of parents in a merge. At keys 'from_mode' and 'from_id'
there are arrayrefs holding modes and ids, respectively. There is no
'similarity' value, and there is only 'to_file' value and no
'from_file' value.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Add parsing line of raw combined diff ("git diff-tree -c/-cc" output)
as described in section "diff format for merges" in diff-format.txt
to parse_difftree_raw_line subroutine.
Returned hash (or hashref) has for combined diff 'nparents' key which
holds number of parents in a merge. At keys 'from_mode' and 'from_id'
there are arrayrefs holding modes and ids, respectively. There is no
'similarity' value, and there is only 'to_file' value and no
'from_file' value.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| gitweb/gitweb.perl | diffblobblamehistory |