From patchwork Fri Jan 24 15:10:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Richard Earnshaw \(lists\)" X-Patchwork-Id: 182962 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp692470ile; Fri, 24 Jan 2020 07:10:38 -0800 (PST) X-Google-Smtp-Source: APXvYqxrACJkX0cFfZNgiAzIwpyVJSuwQxpyQ7X0YsnwvRXqnMK/0SUoT4FhuXUgkVJi00mxFDBJ X-Received: by 2002:aca:b984:: with SMTP id j126mr2375106oif.174.1579878638145; Fri, 24 Jan 2020 07:10:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579878638; cv=none; d=google.com; s=arc-20160816; b=MjgEFvDpiDxwdbPM5rOYGVzaKzm+p7W+aFZpqI8fbN0XhKmmm/BuPR9FEl8jLNfSnn 3OjrTG9ohicvr5jdzqaKASG3At9E8Es+a6PqSxtLo11Z/mPwOLiZYeqCc/ZLh2Bp+PN1 uLC2vLhedyRO48KgKmw4ru1PF2N0tYnwoaIv6874+CXrPrvM9M/eKeXHhfwuANeMRk6Q rXHY5zzazAeV4q7CqOqdAkI2Vxh5+i2TEF2BrMbvQlRlH4+39yhsgRMqx8MGgLo3MPP8 K8vbbl78zC8RujhEPt2/jR1ckJd6gnJ8yPEyGPNoxkPYSCn0h2s8BOwh1ZWXYf+YYOMs P1yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:date:message-id:subject:from:to :delivered-to:sender:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature; bh=VEMUnlpCAa3InsLG8gWhFD2Hs/0aY1WL1M7kvwWOetM=; b=ZHohXkH/lxs4n0+PwEaXoVMu3YSynjK8Fym0+Z17vdlHDX59m7DT80Iu0cM6BO6sDu 60s6NS0y1DmmIXpDr4wAD7rW11vniG0OXtEDPEgjVHTXOfzUI+NilV37BeSfiSMNXlcS WxqPa3kf7/ikTbecUuOA4dGyxZrEo7PML7x40jEWw5cGJGVDNb+mv3w2slfVGB2+ZQFV O/uaiWL+zx5KsGcf6Lgp3p5PloOYhBP4Wjcv47Flxf3PeA1eDQ5BXTZ7S6jjRm594b16 kNtBw0l1gp2iFbX/e5Utz5q9dPGqwde9tzLY0u1PW1WrzEZB/lUxIomzfHopa18tnLk7 U/yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=b391bh1l; spf=pass (google.com: domain of gcc-patches-return-518223-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-518223-patch=linaro.org@gcc.gnu.org" Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id p12si3081948otk.141.2020.01.24.07.10.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2020 07:10:38 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-518223-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=b391bh1l; spf=pass (google.com: domain of gcc-patches-return-518223-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-518223-patch=linaro.org@gcc.gnu.org" DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=iNvsH396Vpm2yuQ+0hpCseFC5iEYCY4LluCtxgmP2vfqmFpa94 X/XuIc4I9uNw8qEK6h94AMRc7XK/Xa+y8g8EXv8CB4YaMwTOVlaofBNjoTSqCqe5 fTDbWRNLmph+bE4rsOY8bVfeSMd36pf7mq3WGsIPBuWWPUj7tnIOW3uV4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=fHxwygycyZhYMjxQqzuCPo/C86I=; b=b391bh1lBc5LUEyRJTRT 2LGYUmK5aDONzSNkKHQH8HQcsy5WWQ+l8OGRqD3i7A/W8pOkCgmbu1zRnrv4lteu GpewaSxiVsxs3V104WS9T9OIkYwdGWuWtBEe32vt/euXrXhcI8Y4FuaHrZ1h/KHY yRCXKA+ieUwT5n7HqOgLDGo= Received: (qmail 37885 invoked by alias); 24 Jan 2020 15:10:27 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 37877 invoked by uid 89); 24 Jan 2020 15:10:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=personal X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.110.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 24 Jan 2020 15:10:25 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 68CB51FB; Fri, 24 Jan 2020 07:10:23 -0800 (PST) Received: from e120077-lin.cambridge.arm.com (e120077-lin.cambridge.arm.com [10.2.78.81]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1384B3F6C4; Fri, 24 Jan 2020 07:10:22 -0800 (PST) To: "gcc-patches@gcc.gnu.org" From: "Richard Earnshaw (lists)" Subject: [committed] wwwdocs: gitwrite: tweaks for the change in the personal branch support Message-ID: Date: Fri, 24 Jan 2020 15:10:21 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 As described in https://gcc.gnu.org/ml/gcc-patches/2020-01/msg01660.html I've had to change the personal branch space configuration slightly to avoid problems with ambiguous refs. This patch updates wwwdocs to reflect that change. It also adds documentation for the new contrib/git-add-user-branch.sh script. Applied. R. diff --git a/htdocs/gitwrite.html b/htdocs/gitwrite.html index c0fe8526..55667a2d 100644 --- a/htdocs/gitwrite.html +++ b/htdocs/gitwrite.html @@ -424,25 +424,17 @@ some aliases that might be useful when developing GCC. The script will settings configured by the script will still be useful. -

If you have multiple clones of the gcc repository you can fetch +

If you have personal branches pushed to the gcc repository you can fetch updates from your personal space by running - git fetch me -(or whatever personal prefix you've chosen). You can also push an -already existing branch using git push me me/branch. -Beware that if you have more than one personal branch set up locally, -simply typing git push me will potentially push all such -personal branches. Use --dry-run to check that what will be pushed is -what you intend.

- -

To create a new personal branch, the following sequence of steps can be -used:

-
-  git push me <start-ref>:refs/users/<userid>/heads/<topic>
-  git fetch me
-  git checkout -b me/<topic> remotes/me/<topic>
-
-

If you've used a different personal prefix to 'me' then use that - in the sequence described above.

+git fetch users/me (or whatever personal prefix you've +chosen). You can also push an already existing branch using git +push users/me me/branch. Beware that if you have more than one +personal branch set up locally, simply typing git push +users/me will potentially push all personal branches based on +that remote. Use --dry-run to check that what will be pushed is what +you intend. The script contrib/git-add-user-branch.sh +can be used to create a new personal branch which can be pushed and +pulled from the users/me remote.

The script also defines a few useful aliases that can be used with the repository:

@@ -523,6 +515,28 @@ This will create the branch both locally and on the server, but will not check the branch out locally. You can do that afterwards with git checkout or git worktree. +

contrib/git-add-user-branch.sh

+ +

before this script can be used, your personal space access should be + set up by running contrib/gcc-git-cusomization.sh.

+ +

The script takes two arguments, the name of the new branch to create + and a ref to create it from. The personal prefix for the new + branch is optional and will be automatically added if omitted. For example, + if your personal prefix is the default (me), then running:

+ +
+    contrib/git-add-user-branch.sh topic master
+
+ +

will set up a branch called topic on the server and a + local branch called me/topic that tracks it. The banch + can then be pushed using:

+ +
+    git push users/me me/topic
+
+

Tips&Tricks around your account