undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet"

Browse Source 
Currently "git rev-parse --verify <something>" is often used with
its error output redirected to /dev/null. This patch makes it
easier to do that.

The -q|--quiet option is designed to work the same way as it does
for "git symbolic-ref".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2008-04-26 13:57:23 +02:00 committed by Junio C Hamano
parent 36c79d2bf8
commit b1b359699a
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-rev-parse.txt
View File

@ -52,6 +52,11 @@ OPTIONS
The parameter given must be usable as a single, valid The parameter given must be usable as a single, valid
object name. Otherwise barf and abort. object name. Otherwise barf and abort.
-q, --quiet::
Only meaningful in `--verify` mode. Do not output an error
message if the first argument is not a valid object name;
instead exit with non-zero status silently.
--sq:: --sq::
Usually the output is made one line per flag and Usually the output is made one line per flag and
parameter. This option makes output a single line, parameter. This option makes output a single line,

20
builtin-rev-parse.c
View File

@ -365,9 +365,17 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
return 0; return 0;
} }
static void die_no_single_rev(int quiet)
{
if (quiet)
exit(1);
else
die("Needed a single revision");
}
int cmd_rev_parse(int argc, const char **argv, const char *prefix) int cmd_rev_parse(int argc, const char **argv, const char *prefix)
{ {
int i, as_is = 0, verify = 0; int i, as_is = 0, verify = 0, quiet = 0;
unsigned char sha1[20]; unsigned char sha1[20];
if (argc > 1 && !strcmp("--parseopt", argv[1])) if (argc > 1 && !strcmp("--parseopt", argv[1]))
@ -432,6 +440,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
verify = 1; verify = 1;
continue; continue;
} }
if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
quiet = 1;
continue;
}
if (!strcmp(arg, "--short") || if (!strcmp(arg, "--short") ||
!prefixcmp(arg, "--short=")) { !prefixcmp(arg, "--short=")) {
filter &= ~(DO_FLAGS|DO_NOREV); filter &= ~(DO_FLAGS|DO_NOREV);
@ -549,7 +561,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (show_flag(arg) && verify) if (show_flag(arg) && verify)
die("Needed a single revision"); die_no_single_rev(quiet);
continue; continue;
} }
@ -568,11 +580,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
if (!show_file(arg)) if (!show_file(arg))
continue; continue;
if (verify) if (verify)
die("Needed a single revision"); die_no_single_rev(quiet);
verify_filename(prefix, arg); verify_filename(prefix, arg);
} }
show_default(); show_default();
if (verify && revs_count != 1) if (verify && revs_count != 1)
die("Needed a single revision"); die_no_single_rev(quiet);
return 0; return 0;
} }