From patchwork Mon May 25 23:27:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Lorber X-Patchwork-Id: 11569657 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 84F3B913 for ; Mon, 25 May 2020 23:35:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76F262071C for ; Mon, 25 May 2020 23:35:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388373AbgEYXe7 (ORCPT ); Mon, 25 May 2020 19:34:59 -0400 Received: from smtp-1.his.com ([216.194.195.13]:38861 "EHLO smtp-1.his.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387888AbgEYXez (ORCPT ); Mon, 25 May 2020 19:34:55 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp-1.his.com (Postfix) with ESMTP id A675F609CD for ; Mon, 25 May 2020 19:27:52 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at smtp-1.his.com X-Spam-Flag: NO X-Spam-Score: -1.911 X-Spam-Level: X-Spam-Status: No, score=-1.911 tagged_above=-99 required=4 tests=[BAYES_00=-1.9, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from smtp-1.his.com ([127.0.0.1]) by localhost (smtp-1.his.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hxpQMWmjpu8o for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from smtp-nf-201.his.com (smtp-nf-201.his.com [216.194.196.93]) by smtp-1.his.com (Postfix) with ESMTP id 24A68609A0 for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from cuda201.his.com (cuda201.his.com [216.194.196.22]) by smtp-nf-201.his.com (Postfix) with ESMTPS id 654D0609C9 for ; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-ASG-Debug-ID: 1590449268-061c4120522f25f0001-QuoKaX Received: from smtp-nf-202.his.com (smtp-nf-202.his.com [216.194.196.20]) by cuda201.his.com with ESMTP id 8LQO3y8gYiNisveo for ; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-Barracuda-Envelope-From: keni@his.com X-Barracuda-RBL-Trusted-Forwarder: 216.194.196.20 Received: from zproxy101.his.com (zproxy101.his.com [18.218.2.49]) by smtp-nf-202.his.com (Postfix) with ESMTPS id EB8A1601CD for ; Mon, 25 May 2020 19:27:47 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id B4C3E177EA9; Mon, 25 May 2020 19:27:47 -0400 (EDT) X-Barracuda-RBL-IP: 18.218.2.49 X-Barracuda-Effective-Source-IP: zproxy101.his.com[18.218.2.49] X-Barracuda-Apparent-Source-IP: 18.218.2.49 Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id LeXE4tLhfzD2; Mon, 25 May 2020 19:27:47 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 9C65B177ED4; Mon, 25 May 2020 19:27:47 -0400 (EDT) X-Virus-Scanned: amavisd-new at zproxy101.his.com Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 62BTyMVZJKwx; Mon, 25 May 2020 19:27:47 -0400 (EDT) Received: from wings.local (pool-74-96-209-77.washdc.fios.verizon.net [74.96.209.77]) by zproxy101.his.com (Postfix) with ESMTPSA id 7CED2177EA9; Mon, 25 May 2020 19:27:47 -0400 (EDT) Received: from wings.fios-router.home (localhost [127.0.0.1]) by wings.local (8.15.2/8.15.2/Debian-10) with ESMTP id 04PNRkXi021152; Mon, 25 May 2020 19:27:46 -0400 Received: (from keni@localhost) by wings.fios-router.home (8.15.2/8.15.2/Submit) id 04PNRkj7021151; Mon, 25 May 2020 19:27:46 -0400 From: Kenneth Lorber To: git@vger.kernel.org Cc: keni@his.com Subject: [RFC PATCH v2 1/6] doc: Tell the glossary about core.hooksPath Date: Mon, 25 May 2020 19:27:22 -0400 X-ASG-Orig-Subj: [RFC PATCH v2 1/6] doc: Tell the glossary about core.hooksPath Message-Id: <20200525232727.21096-2-keni@his.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525232727.21096-1-keni@his.com> References: <1589681624-36969-1-git-send-email-keni@hers.com> <20200525232727.21096-1-keni@his.com> X-Barracuda-Connect: smtp-nf-202.his.com[216.194.196.20] X-Barracuda-Start-Time: 1590449268 X-Barracuda-URL: https://spam.his.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at his.com X-Barracuda-Scan-Msg-Size: 1490 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=6.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82102 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The user manual glossary entry for hooks now knows about core.hooksPath. Signed-off-by: Kenneth Lorber --- Documentation/glossary-content.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 090c888335..37147db1bc 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -206,10 +206,12 @@ for a more flexible and robust system to do the same thing. to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the - operation is done. The hook scripts are found in the - `$GIT_DIR/hooks/` directory, and are enabled by simply - removing the `.sample` suffix from the filename. In earlier versions - of Git you had to make them executable. + operation is done. The hook scripts are found in `$GIT_DIR/hooks/` + or in any directory specified by the `core.hooksPath` configuration + variable. The sample scripts are enabled by simply + removing the `.sample` suffix from the filename. In earlier versions + of Git you had to make the sample scripts executable manually. + Hook scripts must be executable. See linkgit:githooks[5] for details. [[def_index]]index:: A collection of files with stat information, whose contents are stored From patchwork Mon May 25 23:27:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Lorber X-Patchwork-Id: 11569651 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 91CAB739 for ; Mon, 25 May 2020 23:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8527E207CB for ; Mon, 25 May 2020 23:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388359AbgEYXe4 (ORCPT ); Mon, 25 May 2020 19:34:56 -0400 Received: from smtp-1.his.com ([216.194.195.13]:38862 "EHLO smtp-1.his.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726437AbgEYXez (ORCPT ); Mon, 25 May 2020 19:34:55 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp-1.his.com (Postfix) with ESMTP id 16983609BB for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at smtp-1.his.com X-Spam-Flag: NO X-Spam-Score: -1.911 X-Spam-Level: X-Spam-Status: No, score=-1.911 tagged_above=-99 required=4 tests=[BAYES_00=-1.9, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from smtp-1.his.com ([127.0.0.1]) by localhost (smtp-1.his.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W+zEbrK+W1UP for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from smtp-nf-201.his.com (smtp-nf-201.his.com [216.194.196.93]) by smtp-1.his.com (Postfix) with ESMTP id BF9E76090C for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from cuda201.his.com (cuda201.his.com [216.194.196.22]) by smtp-nf-201.his.com (Postfix) with ESMTPS id 1424662AE6 for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-ASG-Debug-ID: 1590449268-061c4120512f2910001-QuoKaX Received: from smtp-nf-202.his.com (smtp-nf-202.his.com [216.194.196.20]) by cuda201.his.com with ESMTP id Es6NUjRwqvYg12VO for ; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-Barracuda-Envelope-From: keni@his.com X-Barracuda-RBL-Trusted-Forwarder: 216.194.196.20 Received: from zproxy101.his.com (zproxy101.his.com [18.218.2.49]) by smtp-nf-202.his.com (Postfix) with ESMTPS id 8B193601CD for ; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 55E90177EAB; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-Barracuda-RBL-IP: 18.218.2.49 X-Barracuda-Effective-Source-IP: zproxy101.his.com[18.218.2.49] X-Barracuda-Apparent-Source-IP: 18.218.2.49 Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id I7kCozNQqZYw; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 3E015177EAC; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-Virus-Scanned: amavisd-new at zproxy101.his.com Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ioBxu2wOH3fH; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from wings.local (pool-74-96-209-77.washdc.fios.verizon.net [74.96.209.77]) by zproxy101.his.com (Postfix) with ESMTPSA id 216C0177EAB; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from wings.fios-router.home (localhost [127.0.0.1]) by wings.local (8.15.2/8.15.2/Debian-10) with ESMTP id 04PNRlGr021156; Mon, 25 May 2020 19:27:47 -0400 Received: (from keni@localhost) by wings.fios-router.home (8.15.2/8.15.2/Submit) id 04PNRlIA021155; Mon, 25 May 2020 19:27:47 -0400 From: Kenneth Lorber To: git@vger.kernel.org Cc: keni@his.com Subject: [RFC PATCH v2 2/6] doc: Add bit on extending git to Hacking Git Date: Mon, 25 May 2020 19:27:23 -0400 X-ASG-Orig-Subj: [RFC PATCH v2 2/6] doc: Add bit on extending git to Hacking Git Message-Id: <20200525232727.21096-3-keni@his.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525232727.21096-1-keni@his.com> References: <1589681624-36969-1-git-send-email-keni@hers.com> <20200525232727.21096-1-keni@his.com> X-Barracuda-Connect: smtp-nf-202.his.com[216.194.196.20] X-Barracuda-Start-Time: 1590449268 X-Barracuda-URL: https://spam.his.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at his.com X-Barracuda-Scan-Msg-Size: 1120 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=6.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82102 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The Hacking Git section of the user manual is the logical place to look for information on extending Gut, so add a short section of links to places where that information actually lives. Signed-off-by: Kenneth Lorber --- Documentation/user-manual.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 833652983f..2144246444 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -4049,6 +4049,14 @@ and that is what higher level `git merge -s resolve` is implemented with. This chapter covers internal details of the Git implementation which probably only Git developers need to understand. +If you are extending Git using hooks, writing new tools, or otherwise +looking for technical information but not hacking Git itself, the following +documents may be what you are really looking for: + +* hooks: linkgit:githooks[5] +* attributes: linkgit:gitattributes[5] +* new tools: linkgit:git-sh-setup[1] + [[object-details]] === Object storage format From patchwork Mon May 25 23:27:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Lorber X-Patchwork-Id: 11569653 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 A85D0913 for ; Mon, 25 May 2020 23:34:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AC3B207CB for ; Mon, 25 May 2020 23:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388351AbgEYXez (ORCPT ); Mon, 25 May 2020 19:34:55 -0400 Received: from smtp-1.his.com ([216.194.195.13]:38855 "EHLO smtp-1.his.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726029AbgEYXey (ORCPT ); Mon, 25 May 2020 19:34:54 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp-1.his.com (Postfix) with ESMTP id 8C82C609C6 for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at smtp-1.his.com X-Spam-Flag: NO X-Spam-Score: -1.911 X-Spam-Level: X-Spam-Status: No, score=-1.911 tagged_above=-99 required=4 tests=[BAYES_00=-1.9, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from smtp-1.his.com ([127.0.0.1]) by localhost (smtp-1.his.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yiohw2w7CYcd for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from smtp-nf-201.his.com (smtp-nf-201.his.com [216.194.196.93]) by smtp-1.his.com (Postfix) with ESMTP id 360016090C for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from cuda201.his.com (cuda201.his.com [216.194.196.22]) by smtp-nf-201.his.com (Postfix) with ESMTPS id 9FFEE6025F for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-ASG-Debug-ID: 1590449269-061c4120542f3540001-QuoKaX Received: from smtp-nf-202.his.com (smtp-nf-202.his.com [216.194.196.20]) by cuda201.his.com with ESMTP id OEnC7xJBrRoAk8kF for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Barracuda-Envelope-From: keni@his.com X-Barracuda-RBL-Trusted-Forwarder: 216.194.196.20 Received: from zproxy101.his.com (zproxy101.his.com [18.218.2.49]) by smtp-nf-202.his.com (Postfix) with ESMTPS id 19EC5601CD for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id D7CCC177EA1; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-Barracuda-RBL-IP: 18.218.2.49 X-Barracuda-Effective-Source-IP: zproxy101.his.com[18.218.2.49] X-Barracuda-Apparent-Source-IP: 18.218.2.49 Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id XTbBPdlv1lx7; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id C0B69177EAC; Mon, 25 May 2020 19:27:48 -0400 (EDT) X-Virus-Scanned: amavisd-new at zproxy101.his.com Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id tFb2dJyJ2Jhy; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from wings.local (pool-74-96-209-77.washdc.fios.verizon.net [74.96.209.77]) by zproxy101.his.com (Postfix) with ESMTPSA id 99568177EA9; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from wings.fios-router.home (localhost [127.0.0.1]) by wings.local (8.15.2/8.15.2/Debian-10) with ESMTP id 04PNRm1M021160; Mon, 25 May 2020 19:27:48 -0400 Received: (from keni@localhost) by wings.fios-router.home (8.15.2/8.15.2/Submit) id 04PNRlaI021159; Mon, 25 May 2020 19:27:47 -0400 From: Kenneth Lorber To: git@vger.kernel.org Cc: keni@his.com Subject: [RFC PATCH v2 3/6] doc: Add namespace collision guidelines file Date: Mon, 25 May 2020 19:27:24 -0400 X-ASG-Orig-Subj: [RFC PATCH v2 3/6] doc: Add namespace collision guidelines file Message-Id: <20200525232727.21096-4-keni@his.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525232727.21096-1-keni@his.com> References: <1589681624-36969-1-git-send-email-keni@hers.com> <20200525232727.21096-1-keni@his.com> X-Barracuda-Connect: smtp-nf-202.his.com[216.194.196.20] X-Barracuda-Start-Time: 1590449269 X-Barracuda-URL: https://spam.his.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at his.com X-Barracuda-Scan-Msg-Size: 3188 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=6.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82102 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a file of guidelines to prevent the namespace collisions mentioned in git help config without any guidance. Signed-off-by: Kenneth Lorber --- .../technical/namespace-collisions.txt | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 Documentation/technical/namespace-collisions.txt diff --git a/Documentation/technical/namespace-collisions.txt b/Documentation/technical/namespace-collisions.txt new file mode 100644 index 0000000000..2a0cb312c5 --- /dev/null +++ b/Documentation/technical/namespace-collisions.txt @@ -0,0 +1,72 @@ +NAMESPACE COLLISIONS +-------------------- +(Note that the recommendations in this section are under development +and subject to change. At this point they should be considered only +suggestions. If they do not work for your use case, or you are considering +distributing your extension widely, please send a note to the mailing list.) + +Git uses identifiers in a number of different namespaces: + +* environment variables +* files in $GIT_DIR +* files in the working trees +* config sections +* hooks +* attributes + +In order to reduce the chance of collisions between names Git uses +and those used by other entities (users, groups, and extension authors), +the following are recommended best practices. + + +Names reserved to Git: + +* file or directory names ending with `.lock` +* file or directory names starting with `.git` +* filenames in $GIT_DIR +* directory names in $GIT_DIR unless allowed by a rule below +* environment variables starting with `GIT_` +* configuration file sections unless allowed by a rule below +* file or directory names in `$GIT_DIR/hooks` unless allowed by a rule below +* attributes unless allowed by a rule below + + +Names reserved for individual users: + +* The directory `$GIT_DIR/my` +* Environment variables starting with `GIT_MY_` +* Configuration section `my` +* Files or directories in `$GIT_DIR/hooks` starting with `my_` +* Attributes starting with `my_` + +Names reserved for individual repos: + +* The directory `$GIT_DIR/this` +* Environment variables starting with `GIT_THIS_` +* Configuration section `this` +* Files or directories in `$GIT_DIR/hooks` starting with `this_` +* Attributes starting with `this_` + +Names reserved for the lowest level group of people: + +* The directory `$GIT_DIR/our` +* Environment variables starting with `GIT_OUR_` +* Configuration section `our` +* Files or directories in `$GIT_DIR/hooks` starting with `our_` +* Attributes starting with `our_` + +Aliases +~~~~~~~ +Aliases are a special case. Users need to type them so they should be +short, but there is no way to prevent such short names from colliding. +So the documentation or installer should construct something like: + + [alias] + test = !git my-test + my-test = !echo made it + +while detecting collisions for the short name. Then users or local +policy can deal with collisions on the short name. + +This is not meant to cover every possible use case - a policy that +detailed would be ignored and thus of no use. Please play nicely. From patchwork Mon May 25 23:27:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Lorber X-Patchwork-Id: 11569655 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 468C713B4 for ; Mon, 25 May 2020 23:34:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38E61207CB for ; Mon, 25 May 2020 23:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387565AbgEYXey (ORCPT ); Mon, 25 May 2020 19:34:54 -0400 Received: from smtp-1.his.com ([216.194.195.13]:38858 "EHLO smtp-1.his.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725783AbgEYXey (ORCPT ); Mon, 25 May 2020 19:34:54 -0400 X-Greylist: delayed 424 seconds by postgrey-1.27 at vger.kernel.org; Mon, 25 May 2020 19:34:53 EDT Received: from localhost (localhost [127.0.0.1]) by smtp-1.his.com (Postfix) with ESMTP id 03097609B6 for ; Mon, 25 May 2020 19:27:54 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at smtp-1.his.com X-Spam-Flag: NO X-Spam-Score: -1.911 X-Spam-Level: X-Spam-Status: No, score=-1.911 tagged_above=-99 required=4 tests=[BAYES_00=-1.9, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from smtp-1.his.com ([127.0.0.1]) by localhost (smtp-1.his.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I+kqQ+SIyBVF for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from smtp-nf-201.his.com (smtp-nf-201.his.com [216.194.196.93]) by smtp-1.his.com (Postfix) with ESMTP id 77D56609B9 for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from cuda201.his.com (cuda201.his.com [216.194.196.22]) by smtp-nf-201.his.com (Postfix) with ESMTPS id EAD87609C9 for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-ASG-Debug-ID: 1590449269-061c4120522f2600001-QuoKaX Received: from smtp-nf-202.his.com (smtp-nf-202.his.com [216.194.196.20]) by cuda201.his.com with ESMTP id 4qdDsTN4UP3JEl1d for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Barracuda-Envelope-From: keni@his.com X-Barracuda-RBL-Trusted-Forwarder: 216.194.196.20 Received: from zproxy101.his.com (zproxy101.his.com [18.218.2.49]) by smtp-nf-202.his.com (Postfix) with ESMTPS id 759C7601CD for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 4205A177EA1; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Barracuda-RBL-IP: 18.218.2.49 X-Barracuda-Effective-Source-IP: zproxy101.his.com[18.218.2.49] X-Barracuda-Apparent-Source-IP: 18.218.2.49 Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id UEfz_o1ljZGh; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 2BF6C177EAB; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Virus-Scanned: amavisd-new at zproxy101.his.com Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3jMU0IFlSEq6; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from wings.local (pool-74-96-209-77.washdc.fios.verizon.net [74.96.209.77]) by zproxy101.his.com (Postfix) with ESMTPSA id 04AE6177EA9; Mon, 25 May 2020 19:27:48 -0400 (EDT) Received: from wings.fios-router.home (localhost [127.0.0.1]) by wings.local (8.15.2/8.15.2/Debian-10) with ESMTP id 04PNRmhG021164; Mon, 25 May 2020 19:27:48 -0400 Received: (from keni@localhost) by wings.fios-router.home (8.15.2/8.15.2/Submit) id 04PNRmXd021163; Mon, 25 May 2020 19:27:48 -0400 From: Kenneth Lorber To: git@vger.kernel.org Cc: keni@his.com Subject: [RFC PATCH v2 4/6] doc: Add collision doc to gitrepository-layout.txt Date: Mon, 25 May 2020 19:27:25 -0400 X-ASG-Orig-Subj: [RFC PATCH v2 4/6] doc: Add collision doc to gitrepository-layout.txt Message-Id: <20200525232727.21096-5-keni@his.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525232727.21096-1-keni@his.com> References: <1589681624-36969-1-git-send-email-keni@hers.com> <20200525232727.21096-1-keni@his.com> X-Barracuda-Connect: smtp-nf-202.his.com[216.194.196.20] X-Barracuda-Start-Time: 1590449269 X-Barracuda-URL: https://spam.his.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at his.com X-Barracuda-Scan-Msg-Size: 575 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=6.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82102 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Kenneth Lorber --- Documentation/gitrepository-layout.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index 1a2ef4c150..8050e8cc1f 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -292,6 +292,8 @@ worktrees//config.worktree:: include::technical/repository-version.txt[] +include::technical/namespace-collisions.txt[] + SEE ALSO -------- linkgit:git-init[1], From patchwork Mon May 25 23:27:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Lorber X-Patchwork-Id: 11569659 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 2BB56913 for ; Mon, 25 May 2020 23:35:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D261207CB for ; Mon, 25 May 2020 23:35:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388379AbgEYXfB (ORCPT ); Mon, 25 May 2020 19:35:01 -0400 Received: from smtp-1.his.com ([216.194.195.13]:38863 "EHLO smtp-1.his.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388360AbgEYXe6 (ORCPT ); Mon, 25 May 2020 19:34:58 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp-1.his.com (Postfix) with ESMTP id EC2C5609D5 for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at smtp-1.his.com X-Spam-Flag: NO X-Spam-Score: -1.911 X-Spam-Level: X-Spam-Status: No, score=-1.911 tagged_above=-99 required=4 tests=[BAYES_00=-1.9, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from smtp-1.his.com ([127.0.0.1]) by localhost (smtp-1.his.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tk162FB3fVDm for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from smtp-nf-201.his.com (smtp-nf-201.his.com [216.194.196.93]) by smtp-1.his.com (Postfix) with ESMTP id A21526090C for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from cuda201.his.com (cuda201.his.com [216.194.196.22]) by smtp-nf-201.his.com (Postfix) with ESMTPS id 49A7B6025F for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-ASG-Debug-ID: 1590449269-061c4120512f2920001-QuoKaX Received: from smtp-nf-202.his.com (smtp-nf-202.his.com [216.194.196.20]) by cuda201.his.com with ESMTP id lemNIoLRx4Tjvl7P for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Barracuda-Envelope-From: keni@his.com X-Barracuda-RBL-Trusted-Forwarder: 216.194.196.20 Received: from zproxy101.his.com (zproxy101.his.com [18.218.2.49]) by smtp-nf-202.his.com (Postfix) with ESMTPS id D7F8F6023A for ; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 9FCC2177EA9; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Barracuda-RBL-IP: 18.218.2.49 X-Barracuda-Effective-Source-IP: zproxy101.his.com[18.218.2.49] X-Barracuda-Apparent-Source-IP: 18.218.2.49 Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id yNbiVh183JfA; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 87D52177EA1; Mon, 25 May 2020 19:27:49 -0400 (EDT) X-Virus-Scanned: amavisd-new at zproxy101.his.com Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mMomPqQLVCTc; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from wings.local (pool-74-96-209-77.washdc.fios.verizon.net [74.96.209.77]) by zproxy101.his.com (Postfix) with ESMTPSA id 68EAA177EA9; Mon, 25 May 2020 19:27:49 -0400 (EDT) Received: from wings.fios-router.home (localhost [127.0.0.1]) by wings.local (8.15.2/8.15.2/Debian-10) with ESMTP id 04PNRmlq021168; Mon, 25 May 2020 19:27:48 -0400 Received: (from keni@localhost) by wings.fios-router.home (8.15.2/8.15.2/Submit) id 04PNRmtc021167; Mon, 25 May 2020 19:27:48 -0400 From: Kenneth Lorber To: git@vger.kernel.org Cc: keni@his.com Subject: [RFC PATCH v2 5/6] doc: Tell config.txt about namespace collisions Date: Mon, 25 May 2020 19:27:26 -0400 X-ASG-Orig-Subj: [RFC PATCH v2 5/6] doc: Tell config.txt about namespace collisions Message-Id: <20200525232727.21096-6-keni@his.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525232727.21096-1-keni@his.com> References: <1589681624-36969-1-git-send-email-keni@hers.com> <20200525232727.21096-1-keni@his.com> X-Barracuda-Connect: smtp-nf-202.his.com[216.194.196.20] X-Barracuda-Start-Time: 1590449269 X-Barracuda-URL: https://spam.his.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at his.com X-Barracuda-Scan-Msg-Size: 1003 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=6.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82102 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a link to the namespace collisions information where git help config only mentioned the issue without supplying any guidance for how to do that. Signed-off-by: Kenneth Lorber --- Documentation/config.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index ef0768b91a..1e819c26f0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -310,7 +310,9 @@ in the appropriate manual page. Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and -other popular tools, and describe them in your documentation. +other popular tools, and describe them in your documentation. See +'NAMESPACE COLLISIONS' in linkgit:gitrepository-layout[5] for guidelines +to prevent such conflicts. include::config/advice.txt[] From patchwork Mon May 25 23:27:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Lorber X-Patchwork-Id: 11569649 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 2B42E913 for ; Mon, 25 May 2020 23:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 117812071A for ; Mon, 25 May 2020 23:34:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388294AbgEYXey (ORCPT ); Mon, 25 May 2020 19:34:54 -0400 Received: from smtp-1.his.com ([216.194.195.13]:38856 "EHLO smtp-1.his.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725947AbgEYXex (ORCPT ); Mon, 25 May 2020 19:34:53 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp-1.his.com (Postfix) with ESMTP id EEECC609C0 for ; Mon, 25 May 2020 19:27:54 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at smtp-1.his.com X-Spam-Flag: NO X-Spam-Score: -1.911 X-Spam-Level: X-Spam-Status: No, score=-1.911 tagged_above=-99 required=4 tests=[BAYES_00=-1.9, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=ham Received: from smtp-1.his.com ([127.0.0.1]) by localhost (smtp-1.his.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CVBUJmDOeTJQ for ; Mon, 25 May 2020 19:27:51 -0400 (EDT) Received: from smtp-nf-201.his.com (smtp-nf-201.his.com [216.194.196.93]) by smtp-1.his.com (Postfix) with ESMTP id 6B18D609C4 for ; Mon, 25 May 2020 19:27:51 -0400 (EDT) Received: from cuda201.his.com (cuda201.his.com [216.194.196.22]) by smtp-nf-201.his.com (Postfix) with ESMTPS id DEF9B6025F for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-ASG-Debug-ID: 1590449270-061c4120542f3550001-QuoKaX Received: from smtp-nf-202.his.com (smtp-nf-202.his.com [216.194.196.20]) by cuda201.his.com with ESMTP id iFZEOazj0dGSABaD for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-Barracuda-Envelope-From: keni@his.com X-Barracuda-RBL-Trusted-Forwarder: 216.194.196.20 Received: from zproxy101.his.com (zproxy101.his.com [18.218.2.49]) by smtp-nf-202.his.com (Postfix) with ESMTPS id 7CAF3601CD for ; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 493AF177EA1; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-Barracuda-RBL-IP: 18.218.2.49 X-Barracuda-Effective-Source-IP: zproxy101.his.com[18.218.2.49] X-Barracuda-Apparent-Source-IP: 18.218.2.49 Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id bsGTJ7oM8w7W; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zproxy101.his.com (Postfix) with ESMTP id 33529177EA9; Mon, 25 May 2020 19:27:50 -0400 (EDT) X-Virus-Scanned: amavisd-new at zproxy101.his.com Received: from zproxy101.his.com ([127.0.0.1]) by localhost (zproxy101.his.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7UsWOkZsg7rm; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from wings.local (pool-74-96-209-77.washdc.fios.verizon.net [74.96.209.77]) by zproxy101.his.com (Postfix) with ESMTPSA id 0E97B177EA1; Mon, 25 May 2020 19:27:50 -0400 (EDT) Received: from wings.fios-router.home (localhost [127.0.0.1]) by wings.local (8.15.2/8.15.2/Debian-10) with ESMTP id 04PNRnJE021172; Mon, 25 May 2020 19:27:49 -0400 Received: (from keni@localhost) by wings.fios-router.home (8.15.2/8.15.2/Submit) id 04PNRntB021171; Mon, 25 May 2020 19:27:49 -0400 From: Kenneth Lorber To: git@vger.kernel.org Cc: keni@his.com Subject: [RFC PATCH v2 6/6] doc: Add collision reference to Hacking Git Date: Mon, 25 May 2020 19:27:27 -0400 X-ASG-Orig-Subj: [RFC PATCH v2 6/6] doc: Add collision reference to Hacking Git Message-Id: <20200525232727.21096-7-keni@his.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200525232727.21096-1-keni@his.com> References: <1589681624-36969-1-git-send-email-keni@hers.com> <20200525232727.21096-1-keni@his.com> X-Barracuda-Connect: smtp-nf-202.his.com[216.194.196.20] X-Barracuda-Start-Time: 1590449270 X-Barracuda-URL: https://spam.his.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at his.com X-Barracuda-Scan-Msg-Size: 629 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=6.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82102 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Kenneth Lorber --- Documentation/user-manual.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 2144246444..4ceba4a943 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -4056,6 +4056,7 @@ documents may be what you are really looking for: * hooks: linkgit:githooks[5] * attributes: linkgit:gitattributes[5] * new tools: linkgit:git-sh-setup[1] +* avoiding namespace collisions: linkgit:gitrepository-layout[5] [[object-details]] === Object storage format