[PATCH v2 1/5] diff: allow --no-patch as synonym for -s
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Jul 15, 2013, 17:05 UTC
- Message-ID
- <1373907914-8020-2-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <1373907914-8020-1-git-send-email-Matthieu.Moy@imag.fr>
This follows the usual convention of having a --no-foo option to negate --foo.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- Documentation/rev-list-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index e157ec3..c128a85 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -851,5 +851,6 @@ options may be given. See linkgit:git-diff-files[1] for more options. Show the tree objects in the diff output. This implies '-r'. -s:: +--no-patch:: Suppress diff output. endif::git-rev-list[] diff --git a/diff.c b/diff.c index 6578690..6bd821d 100644 --- a/diff.c +++ b/diff.c @@ -3551,7 +3551,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) options->output_format |= DIFF_FORMAT_NAME; else if (!strcmp(arg, "--name-status")) options->output_format |= DIFF_FORMAT_NAME_STATUS; - else if (!strcmp(arg, "-s")) + else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch")) options->output_format |= DIFF_FORMAT_NO_OUTPUT; else if (!prefixcmp(arg, "--stat")) /* --stat, --stat-width, --stat-name-width, or --stat-count */
-- 1.8.3.1.495.g13f33cf.dirty