threads / patch / 38360

patchdiff: added '-q' option, short option for '--quiet'

Subject: [PATCH] diff: added '-q' option, short option for '--quiet'

## tl;dr

2 messages between Jan 14, 2015 and Jan 14, 2015. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Alexander Kuleshov· Jan 14, 2015, 17:35 UTC · lore

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
---
 Documentation/diff-options.txt | 1 +
 diff.c                         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Show changes to 2 files +2 −1

Documentation/diff-options.txt, diff.c

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2b15050..9160c90 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -491,6 +491,7 @@ ifndef::git-log[]
 	That is, it exits with 1 if there were differences and
 	0 means no differences.
 
+-q
 --quiet::
 	Disable all output of the program. Implies `--exit-code`.
 endif::git-log[]
diff --git a/diff.c b/diff.c
index 6ad8970..d778df7 100644
--- a/diff.c
+++ b/diff.c
@@ -3798,7 +3798,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 	}
 	else if (!strcmp(arg, "--exit-code"))
 		DIFF_OPT_SET(options, EXIT_WITH_STATUS);
-	else if (!strcmp(arg, "--quiet"))
+	else if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q"))
 		DIFF_OPT_SET(options, QUICK);
 	else if (!strcmp(arg, "--ext-diff"))
 		DIFF_OPT_SET(options, ALLOW_EXTERNAL);

-- 
2.3.0.rc0.256.gb0e92c0

Junio C Hamano· Jan 14, 2015, 18:52 UTC · re: Alexander Kuleshov · lore

Re: [PATCH] diff: added '-q' option, short option for '--quiet'

Alexander Kuleshov <kuleshovmail@gmail.com> writes:

Show 5 quoted lines

> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
> ---
>  Documentation/diff-options.txt | 1 +
>  diff.c                         | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)

I think we have deliberately refrained from doing this, as it will make "git diff" inconsistent with the underlying "git diff-fiels".

Show 26 quoted lines

>
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 2b15050..9160c90 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -491,6 +491,7 @@ ifndef::git-log[]
>  	That is, it exits with 1 if there were differences and
>  	0 means no differences.
>  
> +-q
>  --quiet::
>  	Disable all output of the program. Implies `--exit-code`.
>  endif::git-log[]
> diff --git a/diff.c b/diff.c
> index 6ad8970..d778df7 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3798,7 +3798,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
>  	}
>  	else if (!strcmp(arg, "--exit-code"))
>  		DIFF_OPT_SET(options, EXIT_WITH_STATUS);
> -	else if (!strcmp(arg, "--quiet"))
> +	else if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q"))
>  		DIFF_OPT_SET(options, QUICK);
>  	else if (!strcmp(arg, "--ext-diff"))
>  		DIFF_OPT_SET(options, ALLOW_EXTERNAL);