diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:44 -0400 |
| commit | d32dd8add53120cef9b30be4240010c2ab6bfc6f (patch) | |
| tree | 19666d93be82cedcdce364d59ca81dacd68ea84c /builtin/bundle.c | |
| parent | bf0d9d0d347ddee86d4e848c70584666d384f026 (diff) | |
| parent | 8628a842bddda7723ad7548b7f6d141123a164a0 (diff) | |
| download | git-d32dd8add53120cef9b30be4240010c2ab6bfc6f.tar.gz | |
Merge branch 'ds/bundle-uri-3'
Define the logical elements of a "bundle list", data structure to
store them in-core, format to transfer them, and code to parse
them.
* ds/bundle-uri-3:
bundle-uri: suppress stderr from remote-https
bundle-uri: quiet failed unbundlings
bundle: add flags to verify_bundle()
bundle-uri: fetch a list of bundles
bundle: properly clear all revision flags
bundle-uri: limit recursion depth for bundle lists
bundle-uri: parse bundle list in config format
bundle-uri: unit test "key=value" parsing
bundle-uri: create "key=value" line parsing
bundle-uri: create base key-value pair parsing
bundle-uri: create bundle_list struct and helpers
bundle-uri: use plain string in find_temp_filename()
Diffstat (limited to 'builtin/bundle.c')
| -rw-r--r-- | builtin/bundle.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/bundle.c b/builtin/bundle.c index 544c78a5f3..c12c09f854 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -129,7 +129,8 @@ static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) { goto cleanup; } close(bundle_fd); - if (verify_bundle(the_repository, &header, !quiet)) { + if (verify_bundle(the_repository, &header, + quiet ? VERIFY_BUNDLE_QUIET : VERIFY_BUNDLE_VERBOSE)) { ret = 1; goto cleanup; } @@ -195,7 +196,7 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) strvec_pushl(&extra_index_pack_args, "-v", "--progress-title", _("Unbundling objects"), NULL); ret = !!unbundle(the_repository, &header, bundle_fd, - &extra_index_pack_args) || + &extra_index_pack_args, 0) || list_bundle_refs(&header, argc, argv); bundle_header_release(&header); cleanup: |