From patchwork Thu Mar 12 17:09:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Robert X-Patchwork-Id: 11434989 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3C6414E5 for ; Thu, 12 Mar 2020 17:10:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D45B420716 for ; Thu, 12 Mar 2020 17:10:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VEz+CazG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726526AbgCLRKP (ORCPT ); Thu, 12 Mar 2020 13:10:15 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38701 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726464AbgCLRKP (ORCPT ); Thu, 12 Mar 2020 13:10:15 -0400 Received: by mail-wm1-f65.google.com with SMTP id t13so840384wmi.3 for ; Thu, 12 Mar 2020 10:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9GBnKL8VQGIyVS9jdwxsv0Pj7oTt9d2vYIPkbs/VG0E=; b=VEz+CazGgwm2ZnmPKe6edcy5wybqomwrfqbx1v4ampXn2YoaHiACQC7BCxMD79Jol9 2beMj9pAi9ZpD4LSWVFtRiWcrzMWoeopQci8gGZFGaG+FP+KVj5Rfl4QprNCKcMSe2qx 3XEJrb1tv03tJnK52YsCise0hU9sItzkTKk59S7aIP+Ka9DRhzINrQiRzn646uSbamjL bHdrGJsUIqYQ505cM/XUnoklqTSFYTe7P8bMy9LNi6MwupBbhAdHnOhVRNMk2m5H7Jm+ PNmyAV83g7eoxa4OdGVf34plJqzkyG02+63bzex8VTyXrrvRIex1LQLQ76JDBcICzNp3 9Z1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9GBnKL8VQGIyVS9jdwxsv0Pj7oTt9d2vYIPkbs/VG0E=; b=lfMaaPJwlf49xsw3TSxPje0LbzCOeVP5Dazv03LtF9HrBCLgXfAzjD+1bRVQJ4ej/E LCFVMfZca/ooOlGsJtg03ZdPFQGSnudcankcfy2SHYaTX7ivPWGI3WHFC4KEMC2f3ymf NNcELdQ5ppTSCOsp1Ukqu1XA7VIgK+W3sdswW9+rKg/On8Tx9zTiqFi6eGHF12gKbz5f fCFAUJZO42fSJn3HuJSpFi2iUHwoLos8KpcsBru1xJCzQzv4/280/g8+rEz5R+6KRG0t a4E+fl7sUqaphXTcz/0sbs71YrKbj58kKA4kKny3FUXXWyVHQ3ctoCzdvPs7jFiRnjN8 0Czw== X-Gm-Message-State: ANhLgQ253xQCSDwtqEVK7EhdA1c4tLLFxHWgNxoyKC1YFvdqH9q+XXMm V97C8sox8RU0v3Kotka9qX8= X-Google-Smtp-Source: ADFU+vulkShXan4cCWU8fyYL3aWpC9+VCq/8m3wDjfjyi/yA/1eBjtZjEPy8Dd+7PSTOlYjtj6zQZg== X-Received: by 2002:a1c:e341:: with SMTP id a62mr6068631wmh.121.1584033013890; Thu, 12 Mar 2020 10:10:13 -0700 (PDT) Received: from localhost.localdomain (87-231-246-247.rev.numericable.fr. [87.231.246.247]) by smtp.gmail.com with ESMTPSA id r12sm21593430wrx.26.2020.03.12.10.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 10:10:13 -0700 (PDT) From: Damien Robert X-Google-Original-From: Damien Robert To: Junio C Hamano , git@vger.kernel.org Cc: Damien Robert Subject: [PATCH v2 1/3] pack-objects: change the name of add_objects_in_unpacked_packs Date: Thu, 12 Mar 2020 18:09:29 +0100 Message-Id: <20200312170931.2392490-2-damien.olivier.robert+git@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200312170931.2392490-1-damien.olivier.robert+git@gmail.com> References: <20200228154357.1710521-2-damien.olivier.robert+git@gmail.com> <20200312170931.2392490-1-damien.olivier.robert+git@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `add_objects_in_unpacked_packs` was added in commit 08cdfb13374f31b0c1c47444f55042e7b72c3190 (Sep 2007) to handle the `--keep-unreachable` option. Back then this function would iterate through packs associated to a list of revs, and add all objects that was not already in the object list, hence the name. Now the function simply iterate through all packs (more precisely all local packs not marked as .keep), and add all objects not already in the object list. So rename the function to add_unreachable_packed_objects, to mimic the naming of add_unreachable_loose_objects. Signed-off-by: Damien Robert --- builtin/pack-objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 02aa6ee480..7c563d636c 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3033,7 +3033,7 @@ static int ofscmp(const void *a_, const void *b_) return oidcmp(&a->object->oid, &b->object->oid); } -static void add_objects_in_unpacked_packs(void) +static void add_unreachable_packed_objects(void) { struct packed_git *p; struct in_pack in_pack; @@ -3293,7 +3293,7 @@ static void get_object_list(int ac, const char **av) } if (keep_unreachable) - add_objects_in_unpacked_packs(); + add_unreachable_packed_objects(); if (pack_loose_unreachable) add_unreachable_loose_objects(); if (unpack_unreachable) From patchwork Thu Mar 12 17:09:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Robert X-Patchwork-Id: 11434991 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3E9314E5 for ; Thu, 12 Mar 2020 17:10:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 819F620716 for ; Thu, 12 Mar 2020 17:10:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CqZRD/af" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726558AbgCLRKS (ORCPT ); Thu, 12 Mar 2020 13:10:18 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40481 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726464AbgCLRKS (ORCPT ); Thu, 12 Mar 2020 13:10:18 -0400 Received: by mail-wr1-f65.google.com with SMTP id f3so1484966wrw.7 for ; Thu, 12 Mar 2020 10:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3NpfDHsdhoObKi+/al7YQvsCxWT7qiKlscxNhGD/I4A=; b=CqZRD/af0eZrgizUyAW95UBywfO/bb/LFLUtKWD1Qg4j3MCh4kaWDidWZF8y/CdnMz 4stIxNyi3fm8sR4lHl99VoEaMDQ3JBcyRgs+qTKOkdkSSuPk02gwzNo1uxgmIn/8aSCh HLjjt6nExtBVVp8gFphcT7gqVVsdQHfgi2tb6iZav3waKWEJIG9vqV9Y7qm7VyTRNZmc NaDH2IATQj+vKganDd4eRq4B0m2htIEM9fZ42Gj6NosyeZ+mO+/o4g1idoZvBeJq0B7t x0ZVqTMFa5xNpARVefsLDOwCglRj8zyvUQKekljGph0BFByliHeADiWEuMKMVu7qkVKR cMAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3NpfDHsdhoObKi+/al7YQvsCxWT7qiKlscxNhGD/I4A=; b=XnCBpo4eiwaCh/idt120qQPYuiX0jRWDdY6UO25+uD5Mf+cV6JxPSZjpEI8C/EMXhp jVP33oah19QKjbdNkT2Zli0MXZRaCYO4iNIPHz3epPO5nOjMEAca7RTv8cx6c4pBNSXG om0HJZ9n0rKZRHa5/iD/7cgbLrazqu65HSdCiBVrrTpTEbEiRqo4lHecatQBgV7PbkOG uGVyaeh02F/HTO7i2kEU3Om7tkHXmdjU1MWADT/WIWpi+hYg26XhqWYcg1vyBjf49/Xl ychkrwhumb2ocf9h9DSxUmzwlDsYP46ofJ4kIZDT83qBnZMNMKh9r8FE4q3fdMx8cPeX 1+eQ== X-Gm-Message-State: ANhLgQ3tBORYmnA+qowam2oQiI7UxVdRKSFJXHn9ZnllzGBxLElJf/pS IpkQat5m1baX7f0JGfyT0KY= X-Google-Smtp-Source: ADFU+vuXu9WWjQ2z4y2Vl8DDv4FeXlkTzvO4NhgRc75yf99Y9OOnGx+tlQxC2R0Fkg1xXXYR9RdXmw== X-Received: by 2002:adf:a50b:: with SMTP id i11mr12935515wrb.60.1584033015173; Thu, 12 Mar 2020 10:10:15 -0700 (PDT) Received: from localhost.localdomain (87-231-246-247.rev.numericable.fr. [87.231.246.247]) by smtp.gmail.com with ESMTPSA id r12sm21593430wrx.26.2020.03.12.10.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 10:10:14 -0700 (PDT) From: Damien Robert X-Google-Original-From: Damien Robert To: Junio C Hamano , git@vger.kernel.org Cc: Damien Robert Subject: [PATCH v2 2/3] doc: update the documentation of pack-objects and repack Date: Thu, 12 Mar 2020 18:09:30 +0100 Message-Id: <20200312170931.2392490-3-damien.olivier.robert+git@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200312170931.2392490-1-damien.olivier.robert+git@gmail.com> References: <20200228154357.1710521-2-damien.olivier.robert+git@gmail.com> <20200312170931.2392490-1-damien.olivier.robert+git@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org For pack-objects: - add a documentation for --reflog, --indexed-objects and --write-bitmap-index. - clarify --keep-unreachable. Indeed the current description is out of date: Objects unreachable from the refs in packs named with --unpacked= option are added to the resulting pack, in addition to the reachable objects that are not in packs marked with *.keep files. This implies `--revs`. For example --unpacked= option is now a boolean, and objects in .keep packs are packed except if --honor-pack-keep is given. What --keep-unreachable currently does is simply to add all packed objects to the object list. In particular this includes unreachable objects (both unreachable from the passed revs or even from all revs). - rework the grammar for --pack-loose-unreachable - --unpack-unreachable can also accept a time For repack: - Unify the notation to `git pack-objects` and not `git-pack-objects`. - Specify all options that are passed to `git pack-objects` Signed-off-by: Damien Robert --- Documentation/git-pack-objects.txt | 27 +++++++++++---- Documentation/git-repack.txt | 53 +++++++++++++++++------------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index fecdf2600c..cb4db37a03 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -80,6 +80,14 @@ base-name:: as if all refs under `refs/` are specified to be included. +--reflog:: + This implies `--revs`. + Include objects referred by reflog entries. + +--indexed-objects:: + This implies `--revs`. + Include objects referred to by the index. + --include-tag:: Include unasked-for annotated tags if the object they reference was included in the resulting packfile. This @@ -123,6 +131,11 @@ depth is 4095. The default is unlimited, unless the config variable `pack.packSizeLimit` is set. +--write-bitmap-index:: + Write a reachability bitmap index as part of the pack. This + only makes sense when used with `--all` and the pack is not + written to the standard output. + --honor-pack-keep:: This flag causes an object already in a local pack that has a .keep file to be ignored, even if it would have @@ -286,17 +299,17 @@ Unexpected missing object will raise an error. promisor remote [with .promisor].) This is used with partial clone. --keep-unreachable:: - Objects unreachable from the refs in packs named with - --unpacked= option are added to the resulting pack, in - addition to the reachable objects that are not in packs marked - with *.keep files. This implies `--revs`. + Unreachable packed objects are added to the resulting pack. + This implies `--revs`. --pack-loose-unreachable:: - Pack unreachable loose objects (and their loose counterparts - removed). This implies `--revs`. + Pack unreachable loose objects (and remove their loose counterparts). + This implies `--revs`. ---unpack-unreachable:: +--unpack-unreachable=:: Keep unreachable objects in loose form. This implies `--revs`. + If `` is specified, do not bother loosening any objects older + than ``. --delta-islands:: Restrict delta matches based on "islands". See DELTA ISLANDS diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 92f146d27d..0962562c17 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -68,11 +68,11 @@ to the new separate pack will be written. linkgit:git-pack-objects[1]. -f:: - Pass the `--no-reuse-delta` option to `git-pack-objects`, see + Pass the `--no-reuse-delta` option to `git pack-objects`, see linkgit:git-pack-objects[1]. -F:: - Pass the `--no-reuse-object` option to `git-pack-objects`, see + Pass the `--no-reuse-object` option to `git pack-objects`, see linkgit:git-pack-objects[1]. -q:: @@ -88,13 +88,14 @@ to the new separate pack will be written. --window=:: --depth=:: - These two options affect how the objects contained in the pack are - stored using delta compression. The objects are first internally - sorted by type, size and optionally names and compared against the - other objects within `--window` to see if using delta compression saves - space. `--depth` limits the maximum delta depth; making it too deep - affects the performance on the unpacker side, because delta data needs - to be applied that many times to get to the necessary object. + These two options are passed to `git pack-objects` and affect how + the objects contained in the pack are stored using delta + compression. The objects are first internally sorted by type, size + and optionally names and compared against the other objects within + `--window` to see if using delta compression saves space. `--depth` + limits the maximum delta depth; making it too deep affects the + performance on the unpacker side, because delta data needs to be + applied that many times to get to the necessary object. + The default value for --window is 10 and --depth is 50. The maximum depth is 4095. @@ -103,13 +104,13 @@ depth is 4095. This option is passed through to `git pack-objects`. --window-memory=:: - This option provides an additional limit on top of `--window`; - the window size will dynamically scale down so as to not take - up more than '' bytes in memory. This is useful in - repositories with a mix of large and small objects to not run - out of memory with a large window, but still be able to take - advantage of the large window for the smaller objects. The - size can be suffixed with "k", "m", or "g". + This option is passed to `git pack-objects` and provides an + additional limit on top of `--window`; the window size will + dynamically scale down so as to not take up more than '' bytes + in memory. This is useful in repositories with a mix of large and + small objects to not run out of memory with a large window, but + still be able to take advantage of the large window for the smaller + objects. The size can be suffixed with "k", "m", or "g". `--window-memory=0` makes memory usage unlimited. The default is taken from the `pack.windowMemory` configuration variable. Note that the actual memory usage will be the limit multiplied @@ -122,6 +123,7 @@ depth is 4095. prevents the creation of a bitmap index. The default is unlimited, unless the config variable `pack.packSizeLimit` is set. + This option is passed to `git pack-objects`. -b:: --write-bitmap-index:: @@ -129,7 +131,8 @@ depth is 4095. only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`. This option - has no effect if multiple packfiles are created. + has no effect if multiple packfiles are created, and is passed to + `git pack-objects`. --pack-kept-objects:: Include objects in `.keep` files when repacking. Note that we @@ -145,24 +148,28 @@ depth is 4095. of having `.keep` file on the pack. `` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple - packs. + packs, and is passed to `git pack-objects`. --unpack-unreachable=:: + When used with `-ad`, this option is passed to `git pack-objects`. When loosening unreachable objects, do not bother loosening any objects older than ``. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`. + The `-A` option is synonymous with `-a --unpack-unreachable`. -k:: --keep-unreachable:: - When used with `-ad`, any unreachable objects from existing - packs will be appended to the end of the packfile instead of - being removed. In addition, any unreachable loose objects will - be packed (and their loose counterparts removed). + When used with `-ad`, '--keep-unreachable' and + '--pack-loose-unreachable' are passed to `git pack-objects`. + Any unreachable objects from existing packs will be appended to the + end of the packfile instead of being removed. In addition, any + unreachable loose objects will be packed (and their loose + counterparts removed). -i:: --delta-islands:: - Pass the `--delta-islands` option to `git-pack-objects`, see + Pass the `--delta-islands` option to `git pack-objects`, see linkgit:git-pack-objects[1]. Configuration From patchwork Thu Mar 12 17:09:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Robert X-Patchwork-Id: 11434995 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EBAE990 for ; Thu, 12 Mar 2020 17:10:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8FA7206F1 for ; Thu, 12 Mar 2020 17:10:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eKc+hcev" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726545AbgCLRKS (ORCPT ); Thu, 12 Mar 2020 13:10:18 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:56006 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726443AbgCLRKS (ORCPT ); Thu, 12 Mar 2020 13:10:18 -0400 Received: by mail-wm1-f66.google.com with SMTP id 6so6934493wmi.5 for ; Thu, 12 Mar 2020 10:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6iTEOGbcuaNJkI7z78gVwCX/ED05WFASlMWbAj+JFWc=; b=eKc+hcevRBCEUL0exeP6zX12PfxoAisBJ0CoZYEbh7ehixXAIYM5C9ui7CEeRdh/52 OPhCFO77i5O/7tQST10EbVOU6al4CFHoN0PkaJcVdUsLI8vHNT6F/AcwhseIjsJ28vbh RU7pYf1D+wt9EldUNJcD8DBCdawW8E8Qx9VH1HcFdfxX+9JWsZuo9zVhDuBEASsxQbWQ 57hzDEkmzpJx7CDxaSKZTjFHsymW/kTtg/8/XcuESkWo/bqncVNJAIFvjsgWCPEtAW8v TtSeqE/cbAJmbxcSPBfvlYJXFrx4FEJrHHobEpiHREyhcfhkTPldsz6Ad89XJT0GXPBV gV6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6iTEOGbcuaNJkI7z78gVwCX/ED05WFASlMWbAj+JFWc=; b=CuHG98gkjeEq84b3twbws8zA/+voqThue3lpdZoOa8r9bd28Dj6wn+gSZc54+3YUHY i8TskgsUfD7HAevlnrV4eMoGxNXuepgItt1w+B3YboliI3/pOfxRzydtMRKvBaPphmo8 TOgneXMLOaKJeVZqoXYXnJc7BTRq+ZzwUPd2gJQ0guik3yHwOFCZmV/Z/QVVX2YIrIAk 8Es9JhX9q2+I40zgZJ8N7prqZo2RTKloK1MchoWDPHDMHqBzXVs2RSUdivx+1QTTLPfr atFcLwvVWQphOMfgU9Y5PCCY9JjC3byPbWkFa+ZWXUoDW0agLgiCs13bGwR3J558mUGL qiJA== X-Gm-Message-State: ANhLgQ3zn5nYa//w3grpdgTh8PIqcl+HF3Fs7hYkfQv8uTHPL2N0Yf8E js1jwmhIWwEWTCd/G33BRgg= X-Google-Smtp-Source: ADFU+vsjTlv6Hre9SW0nYc2cAIDUFHJY1uyJjKm52TZkziM94Mllq6jdL2ldi7/AZzF+IQ1D0jk3kA== X-Received: by 2002:a05:600c:2306:: with SMTP id 6mr5722119wmo.86.1584033016396; Thu, 12 Mar 2020 10:10:16 -0700 (PDT) Received: from localhost.localdomain (87-231-246-247.rev.numericable.fr. [87.231.246.247]) by smtp.gmail.com with ESMTPSA id r12sm21593430wrx.26.2020.03.12.10.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 10:10:15 -0700 (PDT) From: Damien Robert X-Google-Original-From: Damien Robert To: Junio C Hamano , git@vger.kernel.org Cc: Damien Robert Subject: [PATCH v2 3/3] doc: add a short explanation for git-repack options Date: Thu, 12 Mar 2020 18:09:31 +0100 Message-Id: <20200312170931.2392490-4-damien.olivier.robert+git@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200312170931.2392490-1-damien.olivier.robert+git@gmail.com> References: <20200228154357.1710521-2-damien.olivier.robert+git@gmail.com> <20200312170931.2392490-1-damien.olivier.robert+git@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org For some git-repack options passed on to git-pack-objects, there was only a link to git-pack-objects(1). Add a short documentation explaining their meaning so that the reader does not have to consult another man page. We also explain that unreachable objects are not packed. Signed-off-by: Damien Robert --- Documentation/git-repack.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 0962562c17..8f7f1140c3 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -14,9 +14,9 @@ SYNOPSIS DESCRIPTION ----------- -This command is used to combine all objects that do not currently -reside in a "pack", into a pack. It can also be used to re-organize -existing packs into a single, more efficient pack. +This command is used to combine all objects (except unreachable ones) that +do not currently reside in a "pack", into a pack. It can also be used to +re-organize existing packs into a single, more efficient pack. A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an @@ -66,18 +66,27 @@ to the new separate pack will be written. -l:: Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-objects[1]. + This causes an object that is borrowed from an alternate + object store to be ignored even if it would have otherwise been + packed. -f:: Pass the `--no-reuse-delta` option to `git pack-objects`, see linkgit:git-pack-objects[1]. + The repack will not reuse existing deltas but compute them from + scratch. -F:: Pass the `--no-reuse-object` option to `git pack-objects`, see linkgit:git-pack-objects[1]. + The repack will not reuse existing object data at all, including + non deltified object, forcing recompression of everything. -q:: Pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]. + This flag makes the command not to report its progress + on the standard error stream. -n:: Do not update the server information with