[PATCH v8 0/3] bundle doc: generalize & elaborate
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jul 31, 2021, 08:23 UTC
- Message-ID
- <cover-v8-0.4-00000000000-20210731T082120Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.3-0000000000-20210727T002001Z-avarab@gmail.com>
As mentioned in v7 I got rid of the comparisons of the bundle header to the format of show-ref: https://lore.kernel.org/git/cover-0.3-0000000000-20210727T002001Z-avarab@gmail.com
Except I managed to miss that it was in two places in the series, sorry. Here's an update with what I meant to send in v7.
Junio also mentioned it being confusing that we mix "basis" and "object prerequisites", I agree, but wanted to keep these changes minimal, so I wasn't rewording the existing occurances of "basis".
This now has a minimal patch-on-top which follows up and rewords those existing and moved-around occurrences of "basis" to "[commit|object] prerequisite(s)".
1. https://lore.kernel.org/git/xmqqa6m69uvh.fsf@gitster.g/#t
Ævar Arnfjörð Bjarmason (4): bundle doc: rewrite the "DESCRIPTION" section bundle doc: elaborate on object prerequisites bundle doc: elaborate on rev<->ref restriction bundle doc: replace "basis" with "prerequsite(s)"
Documentation/git-bundle.txt | 147 ++++++++++++++++++++++++++++------- 1 file changed, 117 insertions(+), 30 deletions(-)
Range-diff against v7:
1: b8f8a20e789 = 1: b8f8a20e789 bundle doc: rewrite the "DESCRIPTION" section
2: 5f344bd24aa = 2: 5f344bd24aa bundle doc: elaborate on object prerequisites
3: 88e7ad1cf49 ! 3: 0e702337c7f bundle doc: elaborate on rev<->ref restriction
@@ Documentation/git-bundle.txt: unbundle <file>::
-specified explicitly (e.g. `^master~10`), or implicitly (e.g.
-`master~10..master`, `--since=10.days.ago master`).
+Revisions must accompanied by reference names to be packaged in a
-+bundle, since the header of the bundle is in a format similar to 'git
-+show-ref'.
++bundle.
+
+More than one reference may be packaged, and more than one basis can
+be specified. The objects packaged are those not contained in the
-: ----------- > 4: 1f3dcd42863 bundle doc: replace "basis" with "prerequsite(s)"-- 2.32.0.1069.g545f0888808