From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 842691F453 for ; Sat, 20 Oct 2018 12:39:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727579AbeJTUto (ORCPT ); Sat, 20 Oct 2018 16:49:44 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:36445 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727554AbeJTUtn (ORCPT ); Sat, 20 Oct 2018 16:49:43 -0400 Received: by mail-lf1-f67.google.com with SMTP id l1-v6so7358831lfc.3 for ; Sat, 20 Oct 2018 05:39:21 -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=JHFwp7npyrJnq8d2j50Ns3jaXWTqWH+WlzzX3aJF3rk=; b=brWqb2J7pMZmmX/C1RIROqM8O76aeQsA9K57EOJf7gSfKOqQxri1ketR6K4kwLBoYR tboqbEwOb3dGtmMxK6YxQb3BPk5Ci3hhjKky55JSS/9VqHU2PwOmG0LQ2IFJ39AzIm/g PG34ekhPZwYMcLWRM/EvRyn+yiSoDdWEkmH+5sp5osKGCyT7gMVU4GyUzFBs6D6LrmGi ULtqZh6VSLnRdldnaLBCTUMMrgToD/E8I7BGsB6lO8AprxllOJ3fr71xmfQX87FuuBxk PwzI2FEuSf2WG2NuUs3thT+iEqie98s7CJSYnnPRV90GVI6sZWxKLE/d/vHNPOzHNUyX XTGQ== 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=JHFwp7npyrJnq8d2j50Ns3jaXWTqWH+WlzzX3aJF3rk=; b=o/EtX3kRuUMNlnCkBmyUCCOxW4L1nAmltcErkNoiRyifPRg12U/hS6P4WGp0D0y0ON Kq3CbU1Tm9LhpKR4NpaRZZR49/wZEmNKJ4/rWhl+pDZ5w008xD7nmZbv0VTomaSwbGiG 6QwfHchQSJoWyBWJFgmv+lQnixCEyxvgaO5vbUOU7ITn/wYT+d5fu1SwipEcDJf9bGIJ BQNaVBpffcQUa7CgsOeMPgH3ULImYQcSI9RB/Jl2Shv2XUyqXh4DOiUkADZAVFNG84KG AamwcLirVY9DvPWC6HAeMnor75o1q6FRFzcWaoVXeEKBOGLGIHYH9uH6fJ0/hjVlsSMN 20qQ== X-Gm-Message-State: ABuFfohhD+EnCsKfPBCj54pEh93M6FIDJQvzZHYaXTYX6n6zzaDdmfBa PUY3DM0udlCmnePn/gmAzrC87Jc7 X-Google-Smtp-Source: ACcGV62aYNhZhuq3ruHttxRAoVu6/QoX8uujKF57tOFUAkFk6+qa2F33cs5RU6gnn2XcEfdjjeM4fw== X-Received: by 2002:a19:ae11:: with SMTP id f17-v6mr5752632lfc.86.1540039160395; Sat, 20 Oct 2018 05:39:20 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:19 -0700 (PDT) From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 20/59] config.txt: move fsck.* to a separate file Date: Sat, 20 Oct 2018 14:38:09 +0200 Message-Id: <20181020123848.2785-21-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 68 +---------------------------------- Documentation/fsck-config.txt | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 67 deletions(-) create mode 100644 Documentation/fsck-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 7c7dde188c..fa26cb1090 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -331,73 +331,7 @@ include::format-config.txt[] include::filter-config.txt[] -fsck.:: - During fsck git may find issues with legacy data which - wouldn't be generated by current versions of git, and which - wouldn't be sent over the wire if `transfer.fsckObjects` was - set. This feature is intended to support working with legacy - repositories containing such data. -+ -Setting `fsck.` will be picked up by linkgit:git-fsck[1], but -to accept pushes of such data set `receive.fsck.` instead, or -to clone or fetch it set `fetch.fsck.`. -+ -The rest of the documentation discusses `fsck.*` for brevity, but the -same applies for the corresponding `receive.fsck.*` and -`fetch..*`. variables. -+ -Unlike variables like `color.ui` and `core.editor` the -`receive.fsck.` and `fetch.fsck.` variables will not -fall back on the `fsck.` configuration if they aren't set. To -uniformly configure the same fsck settings in different circumstances -all three of them they must all set to the same values. -+ -When `fsck.` is set, errors can be switched to warnings and -vice versa by configuring the `fsck.` setting where the -`` is the fsck message ID and the value is one of `error`, -`warn` or `ignore`. For convenience, fsck prefixes the error/warning -with the message ID, e.g. "missingEmail: invalid author/committer line -- missing email" means that setting `fsck.missingEmail = ignore` will -hide that issue. -+ -In general, it is better to enumerate existing objects with problems -with `fsck.skipList`, instead of listing the kind of breakages these -problematic objects share to be ignored, as doing the latter will -allow new instances of the same breakages go unnoticed. -+ -Setting an unknown `fsck.` value will cause fsck to die, but -doing the same for `receive.fsck.` and `fetch.fsck.` -will only cause git to warn. - -fsck.skipList:: - The path to a list of object names (i.e. one unabbreviated SHA-1 per - line) that are known to be broken in a non-fatal way and should - be ignored. On versions of Git 2.20 and later comments ('#'), empty - lines, and any leading and trailing whitespace is ignored. Everything - but a SHA-1 per line will error out on older versions. -+ -This feature is useful when an established project should be accepted -despite early commits containing errors that can be safely ignored -such as invalid committer email addresses. Note: corrupt objects -cannot be skipped with this setting. -+ -Like `fsck.` this variable has corresponding -`receive.fsck.skipList` and `fetch.fsck.skipList` variants. -+ -Unlike variables like `color.ui` and `core.editor` the -`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not -fall back on the `fsck.skipList` configuration if they aren't set. To -uniformly configure the same fsck settings in different circumstances -all three of them they must all set to the same values. -+ -Older versions of Git (before 2.20) documented that the object names -list should be sorted. This was never a requirement, the object names -could appear in any order, but when reading the list we tracked whether -the list was sorted for the purposes of an internal binary search -implementation, which could save itself some work with an already sorted -list. Unless you had a humongous list there was no reason to go out of -your way to pre-sort the list. After Git version 2.20 a hash implementation -is used instead, so there's now no reason to pre-sort the list. +include::fsck-config.txt[] gc.aggressiveDepth:: The depth parameter used in the delta compression diff --git a/Documentation/fsck-config.txt b/Documentation/fsck-config.txt new file mode 100644 index 0000000000..879c5a29c4 --- /dev/null +++ b/Documentation/fsck-config.txt @@ -0,0 +1,67 @@ +fsck.:: + During fsck git may find issues with legacy data which + wouldn't be generated by current versions of git, and which + wouldn't be sent over the wire if `transfer.fsckObjects` was + set. This feature is intended to support working with legacy + repositories containing such data. ++ +Setting `fsck.` will be picked up by linkgit:git-fsck[1], but +to accept pushes of such data set `receive.fsck.` instead, or +to clone or fetch it set `fetch.fsck.`. ++ +The rest of the documentation discusses `fsck.*` for brevity, but the +same applies for the corresponding `receive.fsck.*` and +`fetch..*`. variables. ++ +Unlike variables like `color.ui` and `core.editor` the +`receive.fsck.` and `fetch.fsck.` variables will not +fall back on the `fsck.` configuration if they aren't set. To +uniformly configure the same fsck settings in different circumstances +all three of them they must all set to the same values. ++ +When `fsck.` is set, errors can be switched to warnings and +vice versa by configuring the `fsck.` setting where the +`` is the fsck message ID and the value is one of `error`, +`warn` or `ignore`. For convenience, fsck prefixes the error/warning +with the message ID, e.g. "missingEmail: invalid author/committer line +- missing email" means that setting `fsck.missingEmail = ignore` will +hide that issue. ++ +In general, it is better to enumerate existing objects with problems +with `fsck.skipList`, instead of listing the kind of breakages these +problematic objects share to be ignored, as doing the latter will +allow new instances of the same breakages go unnoticed. ++ +Setting an unknown `fsck.` value will cause fsck to die, but +doing the same for `receive.fsck.` and `fetch.fsck.` +will only cause git to warn. + +fsck.skipList:: + The path to a list of object names (i.e. one unabbreviated SHA-1 per + line) that are known to be broken in a non-fatal way and should + be ignored. On versions of Git 2.20 and later comments ('#'), empty + lines, and any leading and trailing whitespace is ignored. Everything + but a SHA-1 per line will error out on older versions. ++ +This feature is useful when an established project should be accepted +despite early commits containing errors that can be safely ignored +such as invalid committer email addresses. Note: corrupt objects +cannot be skipped with this setting. ++ +Like `fsck.` this variable has corresponding +`receive.fsck.skipList` and `fetch.fsck.skipList` variants. ++ +Unlike variables like `color.ui` and `core.editor` the +`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not +fall back on the `fsck.skipList` configuration if they aren't set. To +uniformly configure the same fsck settings in different circumstances +all three of them they must all set to the same values. ++ +Older versions of Git (before 2.20) documented that the object names +list should be sorted. This was never a requirement, the object names +could appear in any order, but when reading the list we tracked whether +the list was sorted for the purposes of an internal binary search +implementation, which could save itself some work with an already sorted +list. Unless you had a humongous list there was no reason to go out of +your way to pre-sort the list. After Git version 2.20 a hash implementation +is used instead, so there's now no reason to pre-sort the list. -- 2.19.1.647.g708186aaf9