Re: [PATCH (resend)] gitweb: Use --no-commit-id in git_commit and git_commitdiff
From: Junio C Hamano <hidden>
Date: 2016-08-11 19:32:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-08-11 · [PATCH (resend)] gitweb: Use --no-commit-id in git_commit and git_commitdiff · Jakub Narebski <hidden>
Jakub Narebski [off-list ref] writes:
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.
*BLUSH* I think we would need something like this, if only for completeness. -- >8 -- [PATCH] combine-diff: honour --no-commit-id Somehow we forgot to look at no_commit_id flag in these codepaths. Signed-off-by: Junio C Hamano <redacted> --- combine-diff.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/combine-diff.c b/combine-diff.c
index 01a8437..8ff46e8 100644
--- a/combine-diff.c
+++ b/combine-diff.c@@ -737,7 +737,7 @@ static void show_patch_diff(struct combi int added = 0; int deleted = 0; - if (rev->loginfo) + if (rev->loginfo && !rev->no_commit_id) show_log(rev, opt->msg_sep); dump_quoted_path(dense ? "diff --cc " : "diff --combined ", elem->path, c_meta, c_reset);
@@ -815,7 +815,7 @@ static void show_raw_diff(struct combine if (!line_termination) inter_name_termination = 0; - if (rev->loginfo) + if (rev->loginfo && !rev->no_commit_id) show_log(rev, opt->msg_sep); if (opt->output_format & DIFF_FORMAT_RAW) {
@@ -887,7 +887,7 @@ void diff_tree_combined(const unsigned c diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; diffopts.recursive = 1; - show_log_first = !!rev->loginfo; + show_log_first = !!rev->loginfo && !rev->no_commit_id; needsep = 0; /* find set of paths that everybody touches */ for (i = 0; i < num_parent; i++) {