summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-21 18:59:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-21 18:59:08 (GMT)
commitfbe959dde7eafcdae859e21cd734c07c7890c0a4 (patch)
tree3a84214d3b1ca16b4e45a01c9e2270803a128f55 /builtin
parent5498c57cdd637eb4f42ce8e296ce9ca4ab66e289 (diff)
parent06dfc9ebaa154d5074b7afadc2f792a80fba7d0c (diff)
downloadgit-fbe959dde7eafcdae859e21cd734c07c7890c0a4.zip
git-fbe959dde7eafcdae859e21cd734c07c7890c0a4.tar.gz
git-fbe959dde7eafcdae859e21cd734c07c7890c0a4.tar.bz2
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 'builtin')
-rw-r--r--builtin/log.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 069bd3a..e00cea7 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1196,6 +1196,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
int cover_letter = -1;
int boundary_count = 0;
int no_binary_diff = 0;
+ int zero_commit = 0;
struct commit *origin = NULL;
const char *in_reply_to = NULL;
struct patch_ids ids;
@@ -1236,6 +1237,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
OPT_BOOL(0, "no-binary", &no_binary_diff,
N_("don't output binary diffs")),
+ OPT_BOOL(0, "zero-commit", &zero_commit,
+ N_("output all-zero hash in From header")),
OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
N_("don't include a patch matching a commit upstream")),
{ OPTION_SET_INT, 'p', "no-stat", &use_patch_format, NULL,
@@ -1380,6 +1383,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
/* Always generate a patch */
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+ rev.zero_commit = zero_commit;
+
if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
DIFF_OPT_SET(&rev.diffopt, BINARY);