@matheusbsbs / matheus-bagliano / commits / 5ae917acdf
Fork 0

gitweb: Support comparing blobs (files) with different names

Fix the bug that caused "blobdiff" view called with new style URI for a rename with change diff to be show as new (added) file diff. New style URI for "blobdiff" for rename means with $hash_base ('hb') and $hash_parent_base ('hpb') paramaters denoting tree-ish (usually commit) of a blobs being compared, together with both $file_name ('f') and $file_parent ('fp') parameters. It is done by adding $file_parent ('fp') to the path limiter, meaning that diff command becomes: git diff-tree [options] hpb hb -- fp f Other option would be finding hash of a blob using git_get_hash_by_path subroutine and comparing blobs using git-diff, or using extended SHA-1 syntax and compare blobs using git-diff: git diff [options] hpb:fp hp:f Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Mar 30, 2007 at 23:41 UTC 5ae917acdf40444945271e5e014cda37e202504e
1 file changed +2 -2
gitweb/gitweb.perl
+2 -2
@@ -3885,7 +3885,7 @@ sub git_blobdiff {
3885 # read raw output
3886 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
3887 $hash_parent_base, $hash_base,
3888 - "--", $file_name
3888 + "--", (defined $file_parent ? $file_parent : ()), $file_name
3889 or die_error(undef, "Open git-diff-tree failed");
3890 @difftree = map { chomp; $_ } <$fd>;
3891 close $fd
@@ -3935,7 +3935,7 @@ sub git_blobdiff {
3935 # open patch output
3936 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
3937 '-p', $hash_parent_base, $hash_base,
3938 - "--", $file_name
3938 + "--", (defined $file_parent ? $file_parent : ()), $file_name
3939 or die_error(undef, "Open git-diff-tree failed");
3940 }
3941