Add a new option --no-binary to git-format-patch so that no binary changes are included in the generated patches, only notices that those files changed. This generate patches that cannot be applied, but still is useful for generating mails for code review purposes.
See also: commit e47f306d4bf964def1a0b29e8f7cea419471dffd, where --binary option was turned on by default.
Signed-off-by: Caio Marcelo de Oliveira Filho <cmarcelo@gmail.com> ---
This is a first try on the patch. The extra option affects only git-format-patch, since the special case (activating --binary if --text wasn't set) is only there.
Documentation/git-format-patch.txt | 6 ++++++ builtin-log.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletions(-)
Show changes to 2 files +10 −1
Documentation/git-format-patch.txt, builtin-log.c
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index b5207b7..81c930a 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -150,6 +150,12 @@ include::diff-options.txt[] Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. + +--no-binary:: + Don't output contents of changes in binary files, just take note + that they differ. Note that this disable the patch to be properly + applied. By default the contents of changes in those files are + encoded in the patch. + Note that you would need to include the leading dot `.` if you want a filename like `0001-description-of-my-change.patch`, and diff --git a/builtin-log.c b/builtin-log.c index 256bbac..80a01f8 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -757,6 +757,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) int thread = 0; int cover_letter = 0; int boundary_count = 0; + int no_binary_diff = 0; struct commit *origin = NULL, *head = NULL; const char *in_reply_to = NULL; struct patch_ids ids; @@ -862,6 +863,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) fmt_patch_suffix = argv[i] + 9; else if (!strcmp(argv[i], "--cover-letter")) cover_letter = 1; + else if (!strcmp(argv[i], "--no-binary")) + no_binary_diff = 1; else argv[j++] = argv[i]; } @@ -914,7 +917,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (!rev.diffopt.output_format) rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH; - if (!DIFF_OPT_TST(&rev.diffopt, TEXT)) + if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff) DIFF_OPT_SET(&rev.diffopt, BINARY); if (!output_directory && !use_stdout)
-- 1.5.5.1.147.g867f.dirty
