kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff-parseopt: convert --binary 

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2019-03-05 19:30:12 +07:00 committed by Junio C Hamano
parent df84a43627
commit 6d9af6f4da
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/diff-options.txt
View File

@ -425,7 +425,7 @@ endif::git-format-patch[]


--binary:: --binary::
In addition to `--full-index`, output a binary diff that In addition to `--full-index`, output a binary diff that
can be applied with `git-apply`. can be applied with `git-apply`. Implies `--patch`.


--abbrev[=<n>]:: --abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object Instead of showing the full 40-byte hexadecimal object

21
diff.c
View File

@ -4852,6 +4852,18 @@ static int diff_opt_anchored(const struct option *opt,
return 0; return 0;
} }


static int diff_opt_binary(const struct option *opt,
const char *arg, int unset)
{
struct diff_options *options = opt->value;

BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(arg);
enable_patch_output(&options->output_format);
options->flags.binary = 1;
return 0;
}

static int diff_opt_break_rewrites(const struct option *opt, static int diff_opt_break_rewrites(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
@ -5116,6 +5128,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_CALLBACK_F(0, "compact-summary", options, NULL, OPT_CALLBACK_F(0, "compact-summary", options, NULL,
N_("generate compact summary in diffstat"), N_("generate compact summary in diffstat"),
PARSE_OPT_NOARG, diff_opt_compact_summary), PARSE_OPT_NOARG, diff_opt_compact_summary),
OPT_CALLBACK_F(0, "binary", options, NULL,
N_("output a binary diff that can be applied"),
PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_binary),
OPT_CALLBACK_F(0, "output-indicator-new", OPT_CALLBACK_F(0, "output-indicator-new",
&options->output_indicators[OUTPUT_INDICATOR_NEW], &options->output_indicators[OUTPUT_INDICATOR_NEW],
N_("<char>"), N_("<char>"),
@ -5229,11 +5244,7 @@ int diff_opt_parse(struct diff_options *options,
return ac; return ac;


/* flags options */ /* flags options */
if (!strcmp(arg, "--binary")) { if (!strcmp(arg, "--full-index"))
enable_patch_output(&options->output_format);
options->flags.binary = 1;
}
else if (!strcmp(arg, "--full-index"))
options->flags.full_index = 1; options->flags.full_index = 1;
else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
options->flags.text = 1; options->flags.text = 1;