Browse Source

bundle-verify: add --quiet

Add --quiet to git-bundle verify as proposed on the mailing list [1].

Reference: https://www.mail-archive.com/git@vger.kernel.org/msg182844.html <robbat2-20190806T191156-796782357Z@orbis-terrarum.net>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Robin H. Johnson 5 years ago committed by Junio C Hamano
parent
commit
e0eba649e8
  1. 2
      Documentation/git-bundle.txt
  2. 9
      builtin/bundle.c

2
Documentation/git-bundle.txt

@ -10,7 +10,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args> 'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>
'git bundle' verify <file> 'git bundle' verify [-q | --quiet] <file>
'git bundle' list-heads <file> [<refname>...] 'git bundle' list-heads <file> [<refname>...]
'git bundle' unbundle <file> [<refname>...] 'git bundle' unbundle <file> [<refname>...]



9
builtin/bundle.c

@ -13,7 +13,7 @@


static const char * const builtin_bundle_usage[] = { static const char * const builtin_bundle_usage[] = {
N_("git bundle create [<options>] <file> <git-rev-list args>"), N_("git bundle create [<options>] <file> <git-rev-list args>"),
N_("git bundle verify <file>"), N_("git bundle verify [<options>] <file>"),
N_("git bundle list-heads <file> [<refname>...]"), N_("git bundle list-heads <file> [<refname>...]"),
N_("git bundle unbundle <file> [<refname>...]"), N_("git bundle unbundle <file> [<refname>...]"),
NULL NULL
@ -25,7 +25,7 @@ static const char * const builtin_bundle_create_usage[] = {
}; };


static const char * const builtin_bundle_verify_usage[] = { static const char * const builtin_bundle_verify_usage[] = {
N_("git bundle verify <file>"), N_("git bundle verify [<options>] <file>"),
NULL NULL
}; };


@ -97,8 +97,11 @@ static int cmd_bundle_create(int argc, const char **argv, const char *prefix) {
static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) { static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) {
struct bundle_header header; struct bundle_header header;
int bundle_fd = -1; int bundle_fd = -1;
int quiet = 0;


struct option options[] = { struct option options[] = {
OPT_BOOL('q', "quiet", &quiet,
N_("do not show bundle details")),
OPT_END() OPT_END()
}; };
const char* bundle_file; const char* bundle_file;
@ -111,7 +114,7 @@ static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) {
if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0)
return 1; return 1;
close(bundle_fd); close(bundle_fd);
if (verify_bundle(the_repository, &header, 1)) if (verify_bundle(the_repository, &header, !quiet))
return 1; return 1;
fprintf(stderr, _("%s is okay\n"), bundle_file); fprintf(stderr, _("%s is okay\n"), bundle_file);
return 0; return 0;

Loading…
Cancel
Save