[PATCH 2/5] diff: allow --patch to override -s/--no-patch
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:58:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/5] diff: allow --patch to override -s/--no-patch · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 2/5] diff: allow --patch to override -s/--no-patch · Matthieu Moy <hidden>
- 2016-06-15 · Re: [PATCH 2/5] diff: allow --patch to override -s/--no-patch · Junio C Hamano <hidden>
Signed-off-by: Matthieu Moy <redacted> --- diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 6bd821d..66a6877 100644
--- a/diff.c
+++ b/diff.c@@ -3515,9 +3515,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) int argcount; /* Output format options */ - if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")) + if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch")) { + options->output_format &= ~DIFF_FORMAT_NO_OUTPUT; options->output_format |= DIFF_FORMAT_PATCH; - else if (opt_arg(arg, 'U', "unified", &options->context)) + } else if (opt_arg(arg, 'U', "unified", &options->context)) options->output_format |= DIFF_FORMAT_PATCH; else if (!strcmp(arg, "--raw")) options->output_format |= DIFF_FORMAT_RAW;
--
1.8.3.1.495.g13f33cf.dirty