diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2020-01-24 14:38:16 +0000 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@arm.com> | 2020-01-24 14:38:16 +0000 |
| commit | 612137e17109d890948fe30cb997b590b5944df4 (patch) | |
| tree | 0c6e57ab460360b57cd4ca9881f835a02723dfcd /contrib/ChangeLog | |
| parent | ba386bea11173bfa2f7c76b6368a49a43f366eea (diff) | |
contrib: Change 'remote' for personal branches and add branch creation script
Whilst trying to convert the add vendor branch script to work with
personal branches I encountered a minor issue where git would report
ambiguous refs when checking out the new branch.
It turns out that this is because git considers <me>/<topic> to be
ambiguous if both
refs/heads/<me>/<topic>
and
refs/remotes/<me>/<topic>
exist in the list of known branches.
Having thought about this a bit, I think the best solution is to adopt
something more like the vendors space and call the remote users/<me>
(this also works better if you want to set up remotes to track other
users branches as well).
So this patch has two parts.
1) It updates gcc-git-customization.sh to set up the new 'remote' and
converts any existing remote and branches tracking that to the new
format
2) It adds a new script to set up a personal branch on the gcc git repository.
* gcc-git-customization.sh: Use users/<pfx> for the personal remote
rather than just <pfx>. Convert any existing personal branches to the
new remote.
* git-add-user-branch.sh: New file.
Diffstat (limited to 'contrib/ChangeLog')
| -rw-r--r-- | contrib/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index c5e4604d6f5..488a32ca69b 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,10 @@ +2020-01-24 Richard Earnshaw <rearnsha@arm.com> + + * gcc-git-customization.sh: Use users/<pfx> for the personal remote + rather than just <pfx>. Convert existing personal branches to the + new remote. + * git-add-user-branch.sh: New file. + 2020-01-22 Richard Earnshaw <rearnsha@arm.com> * git-add-vendor-branch.sh: New file. |