diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-21 10:59:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-21 10:59:08 -0800 |
| commit | fbe959dde7eafcdae859e21cd734c07c7890c0a4 (patch) | |
| tree | 3a84214d3b1ca16b4e45a01c9e2270803a128f55 /log-tree.c | |
| parent | 5498c57cdd637eb4f42ce8e296ce9ca4ab66e289 (diff) | |
| parent | 06dfc9ebaa154d5074b7afadc2f792a80fba7d0c (diff) | |
| download | git-fbe959dde7eafcdae859e21cd734c07c7890c0a4.tar.gz git-fbe959dde7eafcdae859e21cd734c07c7890c0a4.tar.xz | |
Merge branch 'bc/format-patch-null-from-line'
"format-patch" has learned a new option to zero-out the commit
object name on the mbox "From " line.
* bc/format-patch-null-from-line:
format-patch: check that header line has expected format
format-patch: add an option to suppress commit hash
sha1_file.c: introduce a null_oid constant
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 35e780170..f70a30e12 100644 --- a/log-tree.c +++ b/log-tree.c @@ -342,7 +342,8 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, { const char *subject = NULL; const char *extra_headers = opt->extra_headers; - const char *name = oid_to_hex(&commit->object.oid); + const char *name = oid_to_hex(opt->zero_commit ? + &null_oid : &commit->object.oid); *need_8bit_cte_p = 0; /* unknown */ if (opt->total > 0) { |