diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-10-26 10:50:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 02:16:30 -0700 |
| commit | 35f401a6706238b16906666b72e207e807e71f8a (patch) | |
| tree | 1f9cf9f0f18f1cb5c64943b5149bc1a3f3a5db04 /gitweb | |
| parent | af70fa4f48fdb12fef49c8bf2abc507f80081bf3 (diff) | |
| download | git-35f401a6706238b16906666b72e207e807e71f8a.tar.gz git-35f401a6706238b16906666b72e207e807e71f8a.tar.xz | |
gitweb: Use --no-commit-id in git_commit and git_commitdiff
Use --no-commit-id option to git-diff-tree command in git_commit and
git_commitdiff to filter out commit ID output that git-diff-tree adds
when called with only one <tree-ish> (not only for --stdin). Remove
filtering commit IDs from git-diff-tree output.
This option is in git since at least v1.0.0, so make use of it.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index ba7a42a98..5a81b8ffc 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3133,14 +3133,12 @@ sub git_commit { if (!defined $parent) { $parent = "--root"; } - open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $parent, $hash + open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id", + @diff_opts, $parent, $hash or die_error(undef, "Open git-diff-tree failed"); my @difftree = map { chomp; $_ } <$fd>; close $fd or die_error(undef, "Reading git-diff-tree failed"); - # filter out commit ID output - @difftree = grep(!/^[0-9a-fA-F]{40}$/, @difftree); - # non-textual hash id's can be cached my $expires; if ($hash =~ m/^[0-9a-fA-F]{40}$/) { @@ -3411,15 +3409,14 @@ sub git_commitdiff { my @difftree; if ($format eq 'html') { open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, + "--no-commit-id", "--patch-with-raw", "--full-index", $hash_parent, $hash or die_error(undef, "Open git-diff-tree failed"); while (chomp(my $line = <$fd>)) { # empty line ends raw part of diff-tree output last unless $line; - # filter out commit ID output - push @difftree, $line - unless $line =~ m/^[0-9a-fA-F]{40}$/; + push @difftree, $line; } } elsif ($format eq 'plain') { |