diff options
| author | Derrick Stolee <derrickstolee@github.com> | 2022-03-22 17:28:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-23 20:13:59 (GMT) |
| commit | 017303eb483c48515095abcabf024101951f82ae (patch) | |
| tree | 60d9902b90c566a6c5b65b9178509aa7d02334da /Documentation/git-bundle.txt | |
| parent | 831ee253b7e07dbca3daafcc9cf9143e53220df7 (diff) | |
| download | git-017303eb483c48515095abcabf024101951f82ae.zip git-017303eb483c48515095abcabf024101951f82ae.tar.gz git-017303eb483c48515095abcabf024101951f82ae.tar.bz2 | |
bundle: move capabilities to end of 'verify'
The 'filter' capability was added in 105c6f14a (bundle: parse filter
capability, 2022-03-09), but was added in a strange place in the 'git
bundle verify' output.
The tests for this show output like the following:
The bundle contains these 2 refs:
<COMMIT1> <REF1>
<COMMIT2> <REF2>
The bundle uses this filter: blob:none
The bundle records a complete history.
This looks very odd if we have a thin bundle that contains boundary
commits instead of a complete history:
The bundle contains these 2 refs:
<COMMIT1> <REF1>
<COMMIT2> <REF2>
The bundle uses this filter: blob:none
The bundle requires these 2 refs:
<COMMIT3>
<COMMIT4>
This separation between tip refs and boundary refs is unfortunate. Move
the filter capability output to the end of the output. Update the
documentation to match.
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-bundle.txt')
| -rw-r--r-- | Documentation/git-bundle.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index ac4c435..7685b57 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -75,11 +75,11 @@ verify <file>:: cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. - Information about additional capabilities, such as "object filter", - is printed. See "Capabilities" in link:technical/bundle-format.html - for more information. Finally, 'git bundle' prints a list of - missing commits, if any. The exit code is zero for success, but - will be nonzero if the bundle file is invalid. + Then, 'git bundle' prints a list of missing commits, if any. + Finally, information about additional capabilities, such as "object + filter", is printed. See "Capabilities" in link:technical/bundle-format.html + for more information. The exit code is zero for success, but will + be nonzero if the bundle file is invalid. list-heads <file>:: Lists the references defined in the bundle. If followed by a |