From patchwork Sat Oct 20 12:38:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CD15290 for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA2E42861D for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E9E328623; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 145ED2861D for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727784AbeJTUut (ORCPT ); Sat, 20 Oct 2018 16:50:49 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:42861 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbeJTUus (ORCPT ); Sat, 20 Oct 2018 16:50:48 -0400 Received: by mail-lf1-f68.google.com with SMTP id s10-v6so27111725lfc.9 for ; Sat, 20 Oct 2018 05:40:26 -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=SI4+IDM2p23amc/t3O6T/cd4AndKjQoQXD0/G0/lZTc=; b=I1qL7/Zdl8nhly3QFgKi0/la72BBNYvWvnfdrMzJo48jr9UR2gq035KyF5SGSVO1ij t0cTqDJRwiiZpvDDcJmGQIkreDQujOjOFT2txYrVlAoh3MpAWdDYJPcyr8REsTOXhlRB xLet9ejp8w2bL5pBYvnXIUagZkbL4E71nUppkuIQqNfY4P4I3Qf36UaTknXkhtTcSY+b /zMjh3o3mLzh9xDDpyomBGHmeRoG+DTsF7Ofo4TqPtvHIBJ5QovkOWt8C0+B5ReiNmlh BqJMT+sgVaE+p8cQ7r1FCpbtDRuKJJz/Sj52nu8fACbJdu1OP3ElOfBJhm0/DEybppvn OCCg== 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=SI4+IDM2p23amc/t3O6T/cd4AndKjQoQXD0/G0/lZTc=; b=eF+53PfT61kCdULujbQHrQz2zFoIfmfUFOlwCtS3pTxkQ9iqhKt2amWK8TFUP5LUYi 7KjaCFik53ishZfYgqZWSSF+f6n+9RRE2y1TRjh2hqtdHLXnblKr9WADWY7ULJi+ABvP 1rkSVw7ledX2xZ7ZoDKWqjrEPvIgyG+NCHyrsReOtfgqyGNZrohQ1IzoGMsSpKcYD9nu frxXeLA8NsmQEuZYuxOllNCTOYvtMC6XeQqyKU8/DusY9nBfcFpUWMVwErg98mpH3U0x 4A1YxUP2eWBxKWKNnQ2xXRvZNtnhwgMEp1volZec6GsEbSNt4fV2VMLNmxRAedAuSz3g Wq/w== X-Gm-Message-State: ABuFfohyU/h1Mljq55FkN3tXCe+IL3MzbC2cyDSP7qSWST5ksbF9n7p6 j4ZTntWp1dUtm4CBFN1N4Z3KYMHv X-Google-Smtp-Source: ACcGV61GVS0Zn38Y4zb+5jw1rS36+s22Ab/NsPbHSRBylnV7XXZ7f5Y+mE7MkmGRV+lGQnriaY0fiQ== X-Received: by 2002:a19:53d9:: with SMTP id h86-v6mr5500577lfl.75.1540039225570; Sat, 20 Oct 2018 05:40:25 -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.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:24 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 57/59] config.txt: move versionsort.* to a separate file Date: Sat, 20 Oct 2018 14:38:46 +0200 Message-Id: <20181020123848.2785-58-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 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 34 +--------------------------- Documentation/versionsort-config.txt | 33 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 Documentation/versionsort-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3ccf88ea4c..05fb670be2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -680,39 +680,7 @@ include::url-config.txt[] include::user-config.txt[] -versionsort.prereleaseSuffix (deprecated):: - Deprecated alias for `versionsort.suffix`. Ignored if - `versionsort.suffix` is set. - -versionsort.suffix:: - Even when version sort is used in linkgit:git-tag[1], tagnames - with the same base version but different suffixes are still sorted - lexicographically, resulting e.g. in prerelease tags appearing - after the main release (e.g. "1.0-rc1" after "1.0"). This - variable can be specified to determine the sorting order of tags - with different suffixes. -+ -By specifying a single suffix in this variable, any tagname containing -that suffix will appear before the corresponding main release. E.g. if -the variable is set to "-rc", then all "1.0-rcX" tags will appear before -"1.0". If specified multiple times, once per suffix, then the order of -suffixes in the configuration will determine the sorting order of tagnames -with those suffixes. E.g. if "-pre" appears before "-rc" in the -configuration, then all "1.0-preX" tags will be listed before any -"1.0-rcX" tags. The placement of the main release tag relative to tags -with various suffixes can be determined by specifying the empty suffix -among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and -"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags -are listed first, followed by "v4.8", then "v4.8-ckX" and finally -"v4.8-bfsX". -+ -If more than one suffixes match the same tagname, then that tagname will -be sorted according to the suffix which starts at the earliest position in -the tagname. If more than one different matching suffixes start at -that earliest position, then that tagname will be sorted according to the -longest of those suffixes. -The sorting order between different suffixes is undefined if they are -in multiple config files. +include::versionsort-config.txt[] web.browser:: Specify a web browser that may be used by some commands. diff --git a/Documentation/versionsort-config.txt b/Documentation/versionsort-config.txt new file mode 100644 index 0000000000..6c7cc054fa --- /dev/null +++ b/Documentation/versionsort-config.txt @@ -0,0 +1,33 @@ +versionsort.prereleaseSuffix (deprecated):: + Deprecated alias for `versionsort.suffix`. Ignored if + `versionsort.suffix` is set. + +versionsort.suffix:: + Even when version sort is used in linkgit:git-tag[1], tagnames + with the same base version but different suffixes are still sorted + lexicographically, resulting e.g. in prerelease tags appearing + after the main release (e.g. "1.0-rc1" after "1.0"). This + variable can be specified to determine the sorting order of tags + with different suffixes. ++ +By specifying a single suffix in this variable, any tagname containing +that suffix will appear before the corresponding main release. E.g. if +the variable is set to "-rc", then all "1.0-rcX" tags will appear before +"1.0". If specified multiple times, once per suffix, then the order of +suffixes in the configuration will determine the sorting order of tagnames +with those suffixes. E.g. if "-pre" appears before "-rc" in the +configuration, then all "1.0-preX" tags will be listed before any +"1.0-rcX" tags. The placement of the main release tag relative to tags +with various suffixes can be determined by specifying the empty suffix +among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and +"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags +are listed first, followed by "v4.8", then "v4.8-ckX" and finally +"v4.8-bfsX". ++ +If more than one suffixes match the same tagname, then that tagname will +be sorted according to the suffix which starts at the earliest position in +the tagname. If more than one different matching suffixes start at +that earliest position, then that tagname will be sorted according to the +longest of those suffixes. +The sorting order between different suffixes is undefined if they are +in multiple config files.