From patchwork Tue Jun 15 16:17:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12322321 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BF48C48BDF for ; Tue, 15 Jun 2021 16:18:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F6276162E for ; Tue, 15 Jun 2021 16:18:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229659AbhFOQUy (ORCPT ); Tue, 15 Jun 2021 12:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbhFOQUv (ORCPT ); Tue, 15 Jun 2021 12:20:51 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDD19C061574 for ; Tue, 15 Jun 2021 09:18:45 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id m18so18974535wrv.2 for ; Tue, 15 Jun 2021 09:18:45 -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=rrQyax4pURLNc/y+v1wsru5Ca4Gy7/zuBnXByrtfzBU=; b=Rs20eHlU6UYqI1/PxHn0Mr9KMdHN9WyJGzr+gtovPzebJpLax3wCCTF0lhLioiiIUA xNCSrVXWd8MVty3xi/CkKGGieku1uBMqslMClYcMOb8XvIepPttRHh/Rsl8I05bhFLYU ln4WCZJx+gklDAMVWQa4NEs/BLIemBYkeSzMnw9QR1XTLqniQJXpQADOeKE4g+WBjfvj H64yr5avBkj3Xd+WVdbLqpPkmNV+R8tc6/zebYk4dfTL8slAi0pLnbZstEstUEp/XH20 mkgToSjNvuhNBByGx/WVAMyi6lt/a8oOdwZ22z2oxyeoEANCd6aS4KhLza/ewML2A02m onEw== 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=rrQyax4pURLNc/y+v1wsru5Ca4Gy7/zuBnXByrtfzBU=; b=B8gsKfkWK+ljQqLb/iTSgrrxawEWELZQuOT7jnkVxo0QQNCVTyv8fSwHTagZwLXbTi ajGIi+9/n9hWKohiwrhzdPBbQzqSLptPJzTk8eEVQiLBQ6v1zJYWRiGOYw/JHX4s/r9X yihpOs1NXWtTNpaPLQZkD64NOv0yERRNc1WhbrBoRTYrhQB1dQvgoKDiPOtWF8xgN0L2 fVzAlqCydF7PRLC458OjM7jnrXiVuRonQvLPsvYwOXSG1Qp+suxrd5ufuNBgNd/hJ5se k+iOQsktkQSSvI/VVtT7jpHNjIe53FuIzEMx6nbAQh+IdNKX2p0fld1MGm3oNHhi7dp+ 0rDA== X-Gm-Message-State: AOAM5300chh4GllZf6WSo5A2kpnvpoviljZpeFQn+B9ekKFWuPHprgps UqB8XG03m3AiDH2PN50pf6ljgWt74Ff9Qg== X-Google-Smtp-Source: ABdhPJwNTYScNR08mzHZbEHLjuoIwfSNhLAH3pyUg0o2mHPpdP1iBwGctpHMj0yp0G6am/i/HcuCAA== X-Received: by 2002:a05:6000:10e:: with SMTP id o14mr26419499wrx.76.1623773923380; Tue, 15 Jun 2021 09:18:43 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b8sm2671901wmd.35.2021.06.15.09.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:18:32 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Felipe Contreras , Bagas Sanjaya , Robert Karszniewicz , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 1/6] gittutorial doc: replace "alice" and "bob" with "you" and "www-data" Date: Tue, 15 Jun 2021 18:17:58 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.555.g0268d380f7b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Rephrase the tutorial text added in 927a503cd07 (New tutorial, 2006-01-22) to talk about a repository "you" have, and which you'd like to deploy a local copy of to a "www-data" user, and what it'll take to pull and push changes between the two. There's been some parallel work to get rid of gendered language in the Git documentation[1] which has suggested that examples of "Alice and Bob" should be excluded, as they're commonly used examples in technical documentation, especially documentation that deals with cryptography. I don't think such an example is problematic per-se, and it certainly has its place. But if all we're trying to achieve is a generic example of pushing and pulling between two UIDs on the same (or different) machine(s) it's needlessly verbose, especially to a reader who's not in the know about the meaning of the names in crypto documentation (I daresay that's the vast majority of our users, especially those reading the tutorial). To those in the know it's needlessly distracting. I for one tend do read such documentation half-distracted as I try to remember what the particular implicit meaning of that cast of characters is (if any). Is there going to be an "Eve" at some point who'll serve as a stand-in for the eavesdropper[2]? In this case the answer is "no"; so let's replace the whole thing with a less verbose and I think more common example of wanting to deploy a repository in /home to some other user (the most common of which is probably this www-data example), and pulling and pushing between the two. This commit also fixes the related issue of referring to an "alice.org" domain, we really should use the RFC 2606 domain names instead of potentially being a cause of spam to innocent bystander's E-Mail addresses. 1. http://lore.kernel.org/git/f06092a9053e40d93c4ec94b7fbbb1b8d563957b.1623766273.git.gitgitgadget@gmail.com 2. https://en.wikipedia.org/wiki/Alice_and_Bob#Cast_of_characters Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/gittutorial.txt | 128 +++++++++++++++++----------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index 59ef5cef1f0..7848888b40b 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -280,79 +280,79 @@ out. Using Git for collaboration --------------------------- -Suppose that Alice has started a new project with a Git repository in -/home/alice/project, and that Bob, who has a home directory on the -same machine, wants to contribute. +Suppose that you've started a new project with a Git repository in +/home/you/project, and you'd like another user on the same local +machine to be able to contribute to it. E.g. a www-data user to serve +the content up with a webserver. -Bob begins with: +As the `www-data` user do: ------------------------------------------------ -bob$ git clone /home/alice/project myrepo +www-data$ git clone /home/you/project /var/www-data/deployment ------------------------------------------------ -This creates a new directory "myrepo" containing a clone of Alice's +This creates a new directory "deployment" containing a clone of your repository. The clone is on an equal footing with the original project, possessing its own copy of the original project's history. -Bob then makes some changes and commits them: +As `www-data` you then makes some changes and commit them: ------------------------------------------------ (edit files) -bob$ git commit -a +www-data$ git commit -a (repeat as necessary) ------------------------------------------------ -When he's ready, he tells Alice to pull changes from the repository -at /home/bob/myrepo. She does this with: +You can then pull those changes to the checkout in your home directory +at /home/you/project: ------------------------------------------------ -alice$ cd /home/alice/project -alice$ git pull /home/bob/myrepo master +you$ cd /home/you/project +you$ git pull /var/www-data/deployment master ------------------------------------------------ -This merges the changes from Bob's "master" branch into Alice's -current branch. If Alice has made her own changes in the meantime, -then she may need to manually fix any conflicts. +This merges the changes from the deployment repo's "master" branch into your +current branch. If you've made other changes there in the meantime, +you may need to manually fix any conflicts. The "pull" command thus performs two operations: it fetches changes from a remote branch, then merges them into the current branch. -Note that in general, Alice would want her local changes committed before -initiating this "pull". If Bob's work conflicts with what Alice did since -their histories forked, Alice will use her working tree and the index to +In general you'd want changes in your home directory to be committed before +initiating this "pull". If your www-data work conflicts with them you +can use your working tree and the index to resolve conflicts, and existing local changes will interfere with the conflict resolution process (Git will still perform the fetch but will -refuse to merge --- Alice will have to get rid of her local changes in +refuse to merge --- You'll have to get rid of your local changes in some way and pull again when this happens). -Alice can peek at what Bob did without merging first, using the "fetch" -command; this allows Alice to inspect what Bob did, using a special -symbol "FETCH_HEAD", in order to determine if he has anything worth +You can look at those changes merging first, using the "fetch" +command; this allows you to inspect the remote state, using a special +symbol "FETCH_HEAD", in order to determine if there's anything worth pulling, like this: ------------------------------------------------ -alice$ git fetch /home/bob/myrepo master -alice$ git log -p HEAD..FETCH_HEAD +$ git fetch /var/www-data/deployment master +you$ git log -p HEAD..FETCH_HEAD ------------------------------------------------ -This operation is safe even if Alice has uncommitted local changes. +This operation is safe even if you've got uncommitted local changes. The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable from the FETCH_HEAD but exclude anything that is reachable from HEAD". -Alice already knows everything that leads to her current state (HEAD), -and reviews what Bob has in his state (FETCH_HEAD) that she has not -seen with this command. +You know about everything that leads to your current state (HEAD), +and can review the state of the www-data repoistory (FETCH_HEAD). -If Alice wants to visualize what Bob did since their histories forked -she can issue the following command: +If you want to visualize that difference +you can issue the following command: ------------------------------------------------ $ gitk HEAD..FETCH_HEAD ------------------------------------------------ -This uses the same two-dot range notation we saw earlier with 'git log'. +This uses the same two-dot range notation that 'git log' does. -Alice may want to view what both of them did since they forked. -She can use three-dot form instead of the two-dot form: +To see commits from both repositories did since they forked. +use three-dot form instead of the two-dot form: ------------------------------------------------ $ gitk HEAD...FETCH_HEAD @@ -364,11 +364,11 @@ exclude anything that is reachable from both of them". Please note that these range notation can be used with both gitk and "git log". -After inspecting what Bob did, if there is nothing urgent, Alice may -decide to continue working without pulling from Bob. If Bob's history -does have something Alice would immediately need, Alice may choose to -stash her work-in-progress first, do a "pull", and then finally unstash -her work-in-progress on top of the resulting history. +After inspecting the difference you may +decide to continue working without pulling from www-data. If that history +does have something you need you can +stash your work-in-progress first, do a "pull", and then finally unstash +it on top of the resulting history. When you are working in a small closely knit group, it is not unusual to interact with the same repository over and over @@ -376,79 +376,77 @@ again. By defining 'remote' repository shorthand, you can make it easier: ------------------------------------------------ -alice$ git remote add bob /home/bob/myrepo +you$ git remote add deployment /var/www-data/deployment ------------------------------------------------ -With this, Alice can perform the first part of the "pull" operation -alone using the 'git fetch' command without merging them with her own -branch, using: +With this, you can use the "deployment" name for that remote +as an argument to 'git pull' or 'git fetch': ------------------------------------- -alice$ git fetch bob +you$ git fetch deployment ------------------------------------- -Unlike the longhand form, when Alice fetches from Bob using a +Unlike the longhand form, when you fetch using a remote repository shorthand set up with 'git remote', what was fetched is stored in a remote-tracking branch, in this case -`bob/master`. So after this: +`deployment/master`. So after this: ------------------------------------- -alice$ git log -p master..bob/master +you$ git log -p master..deployment/master ------------------------------------- -shows a list of all the changes that Bob made since he branched from -Alice's master branch. +shows a list of all the changes in deployment/master since it branched +off from your master branch. -After examining those changes, Alice -could merge the changes into her master branch: +After examining those changes, you can merge them into your master branch: ------------------------------------- -alice$ git merge bob/master +you$ git merge deployment/master ------------------------------------- -This `merge` can also be done by 'pulling from her own remote-tracking -branch', like this: +This `merge` can also be done by 'pulling from the remote-tracking +branch': ------------------------------------- -alice$ git pull . remotes/bob/master +you$ git pull . remotes/deployment/master ------------------------------------- Note that git pull always merges into the current branch, regardless of what else is given on the command line. -Later, Bob can update his repo with Alice's latest changes using +Later, the www-data clone can be updated with your latest changes using ------------------------------------- -bob$ git pull +www-data$ git pull ------------------------------------- -Note that he doesn't need to give the path to Alice's repository; -when Bob cloned Alice's repository, Git stored the location of her -repository in the repository configuration, and that location is +Note that you don't need to supply the path to the original repository; +when you cloned it the path was stored in +the repository configuration, and that location is used for pulls: ------------------------------------- -bob$ git config --get remote.origin.url -/home/alice/project +www-data$ git config --get remote.origin.url +/home/you/project ------------------------------------- (The complete configuration created by 'git clone' is visible using `git config -l`, and the linkgit:git-config[1] man page explains the meaning of each option.) -Git also keeps a pristine copy of Alice's master branch under the +That cloned repository also keeps a copy of its remote master branch under the name "origin/master": ------------------------------------- -bob$ git branch -r +www-data$ git branch -r origin/master ------------------------------------- -If Bob later decides to work from a different host, he can still +If you decide to move that deployment clone to a diffeent host, you can still perform clones and pulls using the ssh protocol: ------------------------------------- -bob$ git clone alice.org:/home/alice/project myrepo +www-data$ git clone you.example.org:/home/you/project myrepo ------------------------------------- Alternatively, Git has a native protocol, or can use http; From patchwork Tue Jun 15 16:17:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12322323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2E83C48BE8 for ; Tue, 15 Jun 2021 16:18:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AED95616EC for ; Tue, 15 Jun 2021 16:18:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbhFOQVA (ORCPT ); Tue, 15 Jun 2021 12:21:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbhFOQU7 (ORCPT ); Tue, 15 Jun 2021 12:20:59 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEF0AC061574 for ; Tue, 15 Jun 2021 09:18:54 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso1835917wmc.1 for ; Tue, 15 Jun 2021 09:18:54 -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=54P68A4j0kW0cfpfjZp01+AYsbO1nzRrfEOVCotY9ig=; b=hJbKsvT9aGYYkuCJtu9wvGMxwtFCMr5GCSxHVH1UGHrN8oN2RV4vtqeymThGc8RmYI VCkzCm68CLB6TpIbgoTtiwsEeqvdxoWeq0DDS8ZJ5CgLI2V2HeyUNCmqVPU0WymkX0+F Sce1Y/kPiZj9DVxTagRVBkQjxEn2YRlkW2iWNAV3X/8ppM6u6aDjW98OLi4tk6XfM4CE qY03aoMsvGNLwVtbi+wxGuFnaK6oashBlbKK90VQcpCEWsjxgYSLpJrBTbuNirHB2zF+ mTV0gSCNWZCY80FUvuQnNUd02BEandG83T8RJ8tkkIUVncY5wR1aK3oguDggQBPrZi61 cP2w== 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=54P68A4j0kW0cfpfjZp01+AYsbO1nzRrfEOVCotY9ig=; b=CPQ516QNdO+PbW4co85y3TLUC59bqjnA/MxtJepIpdj8IeofkEHvSI/x9EPJ7+iSA6 40wgbkCLwx0DpYRWHgJEsuw9VwaiZWUPbMMtIzT31I3uwJi6YneZZNt9bsLNERPGOwTK 6RNFKZzjRsIVgC5rJ8srNvZAVg3J6m2mcoGqOVpLhWvUOP3j3mZTVp04admiV6jBAw8l s+TeiR4e9fF0S95a4aVg0KQyLdmsXiK3SRdcYo1Is5XlJP5rP5kNdg/cjDz0GOIXpnZt NNgytWDb8zD1RQ1l9WMJvQYVKQgCQz2KrLuVLm0if5Ms4mSNbcdam9ktOPzg6s3pBKqO EnGw== X-Gm-Message-State: AOAM530dFMQZeUzUiKOyliV6HqY7g0pDky51628WhyjWC0I/GQ1pCSbd LIEcmvw7CRUw+rP/i2vslk2xZGPsUVe73g== X-Google-Smtp-Source: ABdhPJx6BYODuja0R337bKfdr5q+GOqaLOkBKCxKLRrmaK+4pFFLvTQNLGQSnxASFyw/TyOZbtwMbA== X-Received: by 2002:a7b:cb03:: with SMTP id u3mr60254wmj.119.1623773933326; Tue, 15 Jun 2021 09:18:53 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b8sm2671901wmd.35.2021.06.15.09.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:18:48 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Felipe Contreras , Bagas Sanjaya , Robert Karszniewicz , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 2/6] gitcvs-migration doc: replace "alice" and "bob" with "you" and "www-data" Date: Tue, 15 Jun 2021 18:17:59 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.555.g0268d380f7b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Continue the work started in the last commit and change the cast of characters introduced in cd976f5c526 (Documentation: reorganize cvs-migration.txt, 2006-12-06) to refer to the "you" and "www-data" examples the gittutorial documentation now uses. In addition to the reasons for this in the last commit, this also brings the gitcvs-migration documentation in line with the example in the tutorial, which was added by the same author at a around the same time in 927a503cd07 (New tutorial, 2006-01-22). Aside from talking about a bare repository here and a non-bare checkout in the tutorial we use the same paths, and make explicit reference to the more extended documentation in the tutorial here and its relevance to this example. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/gitcvs-migration.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index 1cd1283d0f8..f2ff379886e 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -86,17 +86,21 @@ possibly created from scratch or from a tarball (see linkgit:gittutorial[7]), or imported from an already existing CVS repository (see the next section). -Assume your existing repo is at /home/alice/myproject. Create a new "bare" -repository (a repository without a working tree) and fetch your project into -it: +Assume your existing repo is at /home/you/project. Create a new "bare" +repository (a repository withoupt a working tree) and fetch your project into +it. ------------------------------------------------ -$ mkdir /pub/my-repo.git -$ cd /pub/my-repo.git +$ mkdir /var/www-data/deployment.git +$ cd /var/www-data/deployment.git $ git --bare init --shared -$ git --bare fetch /home/alice/myproject master:master +$ git --bare fetch /home/you/project master:master ------------------------------------------------ +(See the "Using Git for collaboration" section in +linkgit:gittutorial[7] for an extended version of this example that +doesn't use a bare repository.) + Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the machine where the repository is hosted. If you don't want to give them a @@ -107,7 +111,7 @@ Put all the committers in the same group, and make the repository writable by that group: ------------------------------------------------ -$ chgrp -R $group /pub/my-repo.git +$ chgrp -R $group /var/www-data/deployment.git ------------------------------------------------ Make sure committers have a umask of at most 027, so that the directories From patchwork Tue Jun 15 16:18:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12322325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF71AC48BE5 for ; Tue, 15 Jun 2021 16:19:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AC236162F for ; Tue, 15 Jun 2021 16:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbhFOQVM (ORCPT ); Tue, 15 Jun 2021 12:21:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbhFOQVL (ORCPT ); Tue, 15 Jun 2021 12:21:11 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DC86C061574 for ; Tue, 15 Jun 2021 09:19:07 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id v9so2700286wrx.6 for ; Tue, 15 Jun 2021 09:19:07 -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=qxCvKPwWS2aQofvI4ShA4mZyh/7/hisn2HMNxgYeTVs=; b=r0oc4B6RWxNDQqYpF+NGhazMIcvRXKa0M9623f53q3YQ9RC17pjFuPakydWBWE1DTN k7MyGNRUAqf6tRdp+4rPVsaG0SpuuFBKckZUDhSFMbwpEB19hetESZP+az18Lof4KuIv 2yXyoggJATRVFCWBKuIp9stnAt8JG7gt3D6WddHAUpVOrmmOMLwtb8eL/f1fLeGpU3O0 gaHekudvYJrXMF4hclobueVlBCfvcui7eKvza9BuzLDKW7INgj+xALfON+7DRBQtuWC/ MxPz9wRJDmGIUHpThCtMnQv3jjsPTkfiaAMJ2WmWq96K1tulRzA53B/cJjvvViev7h7+ Wjjw== 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=qxCvKPwWS2aQofvI4ShA4mZyh/7/hisn2HMNxgYeTVs=; b=D9APIxwvuPD8AmTkeTjVlNURLRnGAENp9jUGLcm67Lln++4GTFFSClPFZ0jQbJ6sym o4yr/I8+Ji/k6f1ZIjI97pv/DNB1gc5QwNuJbvhMNIQR76bY4pvKrDdOf+G5uUFZCnKx wmnbvB2hdbBK3ltznYPSk13PTnSwQoccNFZ54xsisA4oc2SqPZGTjphURr8qKZWeZjfr nzHLMW0HTq9c89GGeAY1+HDe4a14ZIvlmU+Co7ilFwjDSjxirQto69MlBUopM8V0B3bS yekscYmJ2G0zIGPkYK2WiZ2+977T8vkM5YF5Bd0go6oCbjL7w+inKFghfOcjfv9TKwON LE3w== X-Gm-Message-State: AOAM532rvf9Di1gh9JVxinI18ldWxEApwX4s5jdftbiOZyvKGCIxnTAp S0o0BhUl1JlgLlM/FE7my0/clH57/RD34Q== X-Google-Smtp-Source: ABdhPJzENxHIJ522Btx9OQ5NvbY8g8L6KqQuVLLlpaKiUDWuudUAYM/xify5/stW5Tmn+HfkaJ0Smg== X-Received: by 2002:a5d:47a6:: with SMTP id 6mr26103745wrb.203.1623773945526; Tue, 15 Jun 2021 09:19:05 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b8sm2671901wmd.35.2021.06.15.09.18.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:18:57 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Felipe Contreras , Bagas Sanjaya , Robert Karszniewicz , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 3/6] daemon doc + code comments: reword "alice" example Date: Tue, 15 Jun 2021 18:18:00 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.555.g0268d380f7b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Improve on the "alice" example added in 603968d22b1 (daemon: extend user-relative path notation., 2006-02-04). I found the previous version of this documentation a bit confusing, and had to read the code to see what it was doing. I think explicitly spelling out that the --user-path option can be user to provide an infix to stash in-between what we'll resolve "~user" and the path after that is clearer, especially when coupled with explicit examples of path resolution. Finally, the previous documentation didn't mention that `path/foo` could actually resolve to `path/foo.git`. That's implicitly covered earlier in the documentation, let's make an explicit reference to that here. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-daemon.txt | 13 ++++++++----- daemon.c | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index fdc28c041c7..a109189756d 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -139,11 +139,14 @@ otherwise `stderr`. --user-path=:: Allow {tilde}user notation to be used in requests. When specified with no parameter, requests to - git://host/{tilde}alice/foo is taken as a request to access - 'foo' repository in the home directory of user `alice`. - If `--user-path=path` is specified, the same request is - taken as a request to access `path/foo` repository in - the home directory of user `alice`. + git://host/{tilde}user/foo is taken as a request to access + 'foo' repository in the home directory of user `user`. ++ +If `--user-path=infix` is specified, the `infix` is appended to the path +found with the {tilde}user notation. E.g. a request to access a `some/foo` +repository (git://host/{tilde}user/some/foo) will resolve to (assuming that +`$HOME` is `/home`) either `/home/user/infix/some/foo` (or `[...]/foo.git` +etc., see `--strict-paths` above). --verbose:: Log details about the incoming connections and requested files. diff --git a/daemon.c b/daemon.c index 5c4cbad62d0..a939e5ee0e0 100644 --- a/daemon.c +++ b/daemon.c @@ -46,8 +46,8 @@ static const char *interpolated_path; static int base_path_relaxed; /* If defined, ~user notation is allowed and the string is inserted - * after ~user/. E.g. a request to git://host/~alice/frotz would - * go to /home/alice/pub_git/frotz with --user-path=pub_git. + * after ~user/. E.g. a request to git://host/~user/frotz would + * go to /home/user/pub_git/frotz with --user-path=pub_git. */ static const char *user_path; @@ -188,9 +188,9 @@ static const char *path_ok(const char *directory, struct hostinfo *hi) return NULL; } if (*user_path) { - /* Got either "~alice" or "~alice/foo"; - * rewrite them to "~alice/%s" or - * "~alice/%s/foo". + /* Got either "~user" or "~user/foo"; + * rewrite them to "~user/%s" or + * "~user/%s/foo". */ int namlen, restlen = strlen(dir); const char *slash = strchr(dir, '/'); From patchwork Tue Jun 15 16:18:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12322327 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 986ECC48BDF for ; Tue, 15 Jun 2021 16:19:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 80EDB6162F for ; Tue, 15 Jun 2021 16:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230267AbhFOQVP (ORCPT ); Tue, 15 Jun 2021 12:21:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbhFOQVO (ORCPT ); Tue, 15 Jun 2021 12:21:14 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41F30C061574 for ; Tue, 15 Jun 2021 09:19:09 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id v9so2700394wrx.6 for ; Tue, 15 Jun 2021 09:19:09 -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=AL8pZf3EzXl2cmYcCpzgbNDDcn3eIrO+d5VjL5wVxSo=; b=dehqETJQtH6gwzzJyP/pxm0UUkZDSvZMWMDojSOZwAWZdRrxUQ/aalUpNA8WmYaN9N iE8MaL4NdJ4qslhzB6AKEo6eqk+d+3uSyhAhf7G27nOwqDZWej+M20k6aIssgofWhZQv O5kum7Mc3OQ/6bQy0bLrMAHAnNtfN2gI2WUF8yYep/SNAICwkYn9ogR8KdoBnSdGDta1 HcS4YG8TdKjTWgOZNzkFEAT4yvzgniGSoEYf4dXZWN6iaTaW+4lgfSg2x4sKqeUl0qS/ Br5xBfrEfqjd0bfXMcnTruV98HiwceisFRddsp7IPDN6M0N++JF+JFr+fy11XJErBwIc lCWw== 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=AL8pZf3EzXl2cmYcCpzgbNDDcn3eIrO+d5VjL5wVxSo=; b=DuCI+FDYmnC0MZy2DpowaTCkUT+Ska87KIMQqclZ2DE3CNdjy2UY5MwnNDs9SAoL7+ c4VYNR0vo0aBJSZ7+Q8AGWxIWcZroLfftLN82P7jkKJUCPccfRaoftx/JqQxCkSnQK2i OHIlieq3GsHJvQN5Tlpv/XYWT5296IMdl0Eo2at6z0W7ehh20Sngrp7/K/z4lzPSrRzG se4Vfe5M2yidwp7rC5GPgGn31JZ+7OVSjvHNMEpRs93vZ0HHnW/TNL3t8/DCuyxRO8P3 626m6J+nCpBZ2IJqV9zj30/RKytoSXmHu//AjOluBsw4ulc0Ue35VFOs5CHMuElOsMsq TBcQ== X-Gm-Message-State: AOAM533TrPmmTy3SX8GJCI+MZAGkXD2lAghbMSCjjlislOAabRjuwluQ ySnq0Z2YyjrMIoZlbE413qUd2+pxxUjiMg== X-Google-Smtp-Source: ABdhPJwm49/E6EbM5IZ99gtEVD/TzQ5yl9tcxo4226O6u7YgUhDyVajkR3oXJJu4AWTDPPiLhF4UpA== X-Received: by 2002:adf:d20a:: with SMTP id j10mr4677585wrh.157.1623773947629; Tue, 15 Jun 2021 09:19:07 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b8sm2671901wmd.35.2021.06.15.09.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:19:06 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Felipe Contreras , Bagas Sanjaya , Robert Karszniewicz , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 4/6] fast-import doc: change "bob" in an example to "file.txt" Date: Tue, 15 Jun 2021 18:18:01 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.555.g0268d380f7b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The example added in e7e5170f804 (Update fast-import documentation to discuss crash reports, 2008-02-14) is a bit confusing in that we're referring to a "bob" when we really just need a placeholder name for a file that has bad mode bits, let's use "file.txt" instead. Let's also use "<<-" in the here-doc so this'll work if the reader copies this from e.g. a tab-indented manual page, none of the content needs leading whitespace, so that won't break anything if the content isn't indented. The fast-import error message and other output has also changed slightly since 2008, let's update the relevant parts of it, while retaining the original PID, time etc. of the 2007-era example. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-fast-import.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 39cfa05b28b..ddaa8e5d755 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -1277,7 +1277,7 @@ must be applied manually if the update is needed. An example crash: ==== - $ cat >in <in <<-END_OF_INPUT # my very first test commit commit refs/heads/master committer Shawn O. Pearce 19283 -0400 @@ -1289,12 +1289,13 @@ An example crash: data < X-Patchwork-Id: 12322329 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B78ACC48BDF for ; Tue, 15 Jun 2021 16:19:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9746F616E8 for ; Tue, 15 Jun 2021 16:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230284AbhFOQVT (ORCPT ); Tue, 15 Jun 2021 12:21:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbhFOQVR (ORCPT ); Tue, 15 Jun 2021 12:21:17 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0944C061574 for ; Tue, 15 Jun 2021 09:19:10 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id o3so18986425wri.8 for ; Tue, 15 Jun 2021 09:19:10 -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=2AF5E25ZTUpFDWZubE0o3ziAyNkK2Hep/nQlc2KAIa0=; b=YCGIdlf9QItyR/kuBI6JsesvjrxpYWFSo0jr35qHbo5p6owQ4a44szR8dXWcMdfHsQ IKSCdAr/oa2FFtdnRt26tKRUGYCSjP5Y9pT96pPfRn3IaZ6fktHmfZl+ITwMOTWL4JSt gs9zWJfIYIWqWW2s1sWB3E6wQ/5H9gw9WRLVe3i0gbYAnAhkzLmItnqXBev+EMfYBcmJ a3hGsVXf0t3FijZuaYQetfgPVBWJN/lj399LXGKZ8sWmVPJfPjADhtPjd3jDiGlT35TZ GS3fr4giwWGRPs8tPY3Q9/EH1Tpik6G+XCcUg9WWwkxHT9T0HuPHAkFMMhKDNqW/A78D chwg== 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=2AF5E25ZTUpFDWZubE0o3ziAyNkK2Hep/nQlc2KAIa0=; b=mBowGCgWXhxLWDntMGRuxjXl/uXgtWHFN2J2NrsE/btAc2nabRwj0WZDBaTuZk+fG+ PfuJJ2QYv+W8iKInlCdbDrj5R/NLkipLjPzeE5ERmgWpgR/kKYGv6z8i71L5v+94A+jc LC7UZl7t7YeH6A/bRuo8hbJgYQvj0Dgfb69TRYSyu432TV3nBxmY/RA28qtPQEViXT9N CkDWJRhoTWCArXKiSB2JqomAhD9kPB7SYOBrNzi0HFhp9vd2ABrNFKhw5hnKb2WiDkd2 InwgavGo5WMgrgNqHeOrabdH8Zi9vghO0+KylIeX2EPk0aCtYO9hzwX7QldbHDb9bdl8 i3CQ== X-Gm-Message-State: AOAM533evIoK+kvWASbuqTZRC2rkaJje8zJf89OlZ/m+32As8g9VcDBP dk66aSl4htbaLuE0Mok8PFGUANLoh03bRg== X-Google-Smtp-Source: ABdhPJxf401rewYSpdcEGe+S8CaFA6cqfc8wGoEA4UCVhEh7tnBGoiu+cwZ76zNmpMlWCg1iorSfUw== X-Received: by 2002:adf:df88:: with SMTP id z8mr3769685wrl.330.1623773949232; Tue, 15 Jun 2021 09:19:09 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b8sm2671901wmd.35.2021.06.15.09.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:19:08 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Felipe Contreras , Bagas Sanjaya , Robert Karszniewicz , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 5/6] doc: replace "alice" and "bob" with "jdoe" and "msmith" Date: Tue, 15 Jun 2021 18:18:02 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.555.g0268d380f7b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the "Alice" and "Bob" generic example users to jdoe@example.com and msmith@example.com. The former is widely used in RFC 5322 as an example E-Mail address, the latter is not, but "Mary Smith ". It has been claimed that any reference to people's gender in our documentation is distracting to some readers[1]. In this case it's easy enough to tweak the example in such a way that the reader can insert their own stand-in for "M.". 1. https://lore.kernel.org/git/pull.975.v3.git.1623766273.gitgitgadget@gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-credential.txt | 2 +- Documentation/git-imap-send.txt | 4 ++-- Documentation/git-interpret-trailers.txt | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt index 206e3c5f407..86b4c32affa 100644 --- a/Documentation/git-credential.txt +++ b/Documentation/git-credential.txt @@ -69,7 +69,7 @@ information it has): protocol=https host=example.com - username=bob + username=jdoe password=secr3t + In most cases, this means the attributes given in the input will be diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 63cf498ce9f..902f0e8ed34 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -72,7 +72,7 @@ Using direct mode: [imap] folder = "INBOX.Drafts" host = imap://imap.example.com - user = bob + user = jdoe pass = p4ssw0rd ......................... @@ -82,7 +82,7 @@ Using direct mode with SSL: [imap] folder = "INBOX.Drafts" host = imaps://imap.example.com - user = bob + user = jdoe pass = p4ssw0rd port = 123 ; sslVerify = false diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 956a01d184f..17a19960ba3 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -277,13 +277,13 @@ $ cat msg.txt subject message -$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice ' --trailer 'sign: Bob ' +$ cat msg.txt | git interpret-trailers --trailer 'sign: J. Doe ' --trailer 'sign: M. Smith ' subject message -Signed-off-by: Alice -Signed-off-by: Bob +Signed-off-by: J. Doe +Signed-off-by: M. Smith ------------ * Use the `--in-place` option to edit a message file in place: @@ -294,15 +294,15 @@ subject message -Signed-off-by: Bob -$ git interpret-trailers --trailer 'Acked-by: Alice ' --in-place msg.txt +Signed-off-by: M. Smith +$ git interpret-trailers --trailer 'Acked-by: J. Doe ' --in-place msg.txt $ cat msg.txt subject message -Signed-off-by: Bob -Acked-by: Alice +Signed-off-by: M. Smith +Acked-by: J. Doe ------------ * Extract the last commit as a patch, and add a 'Cc' and a @@ -311,7 +311,7 @@ Acked-by: Alice ------------ $ git format-patch -1 0001-foo.patch -$ git interpret-trailers --trailer 'Cc: Alice ' --trailer 'Reviewed-by: Bob ' 0001-foo.patch >0001-bar.patch +$ git interpret-trailers --trailer 'Cc: J. Doe ' --trailer 'Reviewed-by: M. Smith ' 0001-foo.patch >0001-bar.patch ------------ * Configure a 'sign' trailer with a command to automatically add a @@ -326,12 +326,12 @@ $ git config trailer.sign.command 'echo "$(git config user.name) <$(git config u $ git interpret-trailers < EOF -Signed-off-by: Bob +Signed-off-by: M. Smith $ git interpret-trailers < Signed-off-by: Alice +> Signed-off-by: J. Doe > EOF -Signed-off-by: Alice +Signed-off-by: J. Doe ------------ * Configure a 'fix' trailer with a key that contains a '#' and no From patchwork Tue Jun 15 16:18:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12322331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC403C48BE8 for ; Tue, 15 Jun 2021 16:19:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5C42616E8 for ; Tue, 15 Jun 2021 16:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbhFOQVV (ORCPT ); Tue, 15 Jun 2021 12:21:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230306AbhFOQVT (ORCPT ); Tue, 15 Jun 2021 12:21:19 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20716C0617AF for ; Tue, 15 Jun 2021 09:19:13 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id y7so18966977wrh.7 for ; Tue, 15 Jun 2021 09:19:13 -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=BWdRKor0LCe6A+fJrLCyA0h/u6xzQyjAIHZFUG3e56k=; b=Xh1sHmZmQQJcFvJSl2R/rgoJUNJEXaSIliN5sck12/TSWEdomATu6KDPcJUZOk7VNh 9bwREgLgiwwMWZuCcqASv76lI45CNLbF1MU3ARky9Q7R3s3Z3zCmJPRbLl2GnGFQkQ1z HrDFEHO8QlkG9Y0goLHU4xgH2yTlfEco7CzW7jX6/EDG/FvXrRAlyGI73DwnNSm+jHoa e38Qeaygd0F5Cx/WtceEM1Zc9eq9RWVI+CvBPL6eeivs3ykrYrAd78Ywpy4b5bCoNCvD 9cwEppJZzbKrZNz897np5TuhMIlRIit2b0rLE17zYtFDo0Wk97actz58+9rqilX93qr9 q9Dg== 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=BWdRKor0LCe6A+fJrLCyA0h/u6xzQyjAIHZFUG3e56k=; b=h6CSh6M2PkgiqxVXTZ/0kGwqbLqw4sABlZHH29T78yA8C+OlCS0GjmkabBXi+XdKBO gMKwiJ4ERaIDIR5LMuTizY/DpYHL0HXLIc+sQBnJ1Gir5ifkO4IWg85H1pTeZ4DztKdn mRsm2qKz1kgfIyoGh7G0Z8vD4g9iZQgeFmpegBX380Cog+EYG1G+vxqOY/xhOoUyIwgJ UoSlkxq6GG0RN4wEOgxFdwF/8JKyZNHGz4dv/bpjNbpznzmY/y7Mc5l7jnT1giYafgBm wg8IkdsyK4ggHw5MCPDA3eXSF5qvniSVKr4+wjBJyKPPrda7SefJYi2qhmCFu93WQKBH wvlQ== X-Gm-Message-State: AOAM532wGRXe9jAeWB8XMgkjTOOnfNG2zbCX6kMHLUhqf4bzvQZEoF+X ovFZcAl3naWQJbd5pIe5E5NVPpkWSvJIMg== X-Google-Smtp-Source: ABdhPJw55DLN9QSJJt2YvP6DFrMARgI7ZpiKzcqH7xpWIDRFDyXOLvcTWG0Um33P9RbeQCBLAPho+A== X-Received: by 2002:a05:6000:10e:: with SMTP id o14mr26421702wrx.76.1623773951530; Tue, 15 Jun 2021 09:19:11 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id b8sm2671901wmd.35.2021.06.15.09.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 09:19:09 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Felipe Contreras , Bagas Sanjaya , Robert Karszniewicz , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 6/6] pack-protocol doc: use "www-data" in place of "alice" Date: Tue, 15 Jun 2021 18:18:03 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.555.g0268d380f7b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Replace the example of "alice" in the pack-protocol.txt documentation added in b31222cfb7f (Update packfile transfer protocol documentation, 2009-11-03) with "www-data". This is now consistent with the recently changed examples in the tutorial and git-daemon documentation. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/technical/pack-protocol.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index e13a2c064d1..0f43a290e59 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -136,10 +136,10 @@ directory, because the Git client will run: The exception is if a '~' is used, in which case we execute it without the leading '/'. - ssh://user@example.com/~alice/project.git, + ssh://user@example.com/~www-data/project.git, | v - ssh user@example.com "git-upload-pack '~alice/project.git'" + ssh user@example.com "git-upload-pack '~www-data/project.git'" Depending on the value of the `protocol.version` configuration variable, Git may attempt to send Extra Parameters as a colon-separated string in