From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 102244 invoked by alias); 24 Jan 2020 15:08:10 -0000 Mailing-List: contact gcc-cvs-wwwdocs-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-cvs-wwwdocs-owner@gcc.gnu.org Received: (qmail 102200 invoked by uid 9007); 24 Jan 2020 15:08:10 -0000 Date: Fri, 24 Jan 2020 15:08:00 -0000 Message-ID: <20200124150810.102197.qmail@sourceware.org> From: rearnsha@gcc.gnu.org To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. b9024cd93b5a5aa7de629232e0631c1fbdac4544 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 182ab16b43b0b40b985e0678891b29debef2c9a2 X-Git-Newrev: b9024cd93b5a5aa7de629232e0631c1fbdac4544 X-SW-Source: 2020/txt/msg00074.txt This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "gcc-wwwdocs". The branch, master has been updated via b9024cd93b5a5aa7de629232e0631c1fbdac4544 (commit) from 182ab16b43b0b40b985e0678891b29debef2c9a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b9024cd93b5a5aa7de629232e0631c1fbdac4544 Author: Richard Earnshaw Date: Fri Jan 24 15:07:28 2020 +0000 gitwrite: tweaks for the change in the personal branch support 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. diff --git a/htdocs/gitwrite.html b/htdocs/gitwrite.html index c0fe852..55667a2 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

----------------------------------------------------------------------- Summary of changes: htdocs/gitwrite.html | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) hooks/post-receive -- gcc-wwwdocs