[PATCH 2/3 (amend)] gitweb: Use --no-commit-id in git_commit and git_commitdiff
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Oct 25, 2006, 12:23 UTC
- Message-ID
- <200610251423.21739.jnareb@gmail.com>
- In-Reply-To
- <200610241354.49396.jnareb@gmail.com>
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).
This option is in git since at least v1.0.0, so make use of it.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- This is "amend" patch. It adds --no-commit-id option to git-diff-tree invocation instead of removing commit IDs (tree-ish IDs to be more exact) from git-diff-tree output.
Still, I'm not sure why git-diff-tree outputs tree-ish before diff when called with only one tree-ish. Bugwards compatibility?
gitweb/gitweb.perl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 8ac60be..345e336 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3004,7 +3004,8 @@ 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"); @@ -3321,6 +3322,7 @@ 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");
-- 1.4.2.1