From: Hans-Peter Nilsson <hp@axis.com>
To: <Richard.Earnshaw@arm.com>
Cc: <gcc-patches@gcc.gnu.org>
Subject: Re: [v2] contrib: New remotes structure for vendor and personal refs
Date: Tue, 21 Jan 2020 02:07:00 -0000 [thread overview]
Message-ID: <202001210147.00L1lvmL021141@ignucius.se.axis.com> (raw)
In-Reply-To: <86a1f7a7-04ff-3c65-9229-ce2c7995264f@arm.com> (Richard.Earnshaw@arm.com)
> From: "Richard Earnshaw (lists)" <Richard.Earnshaw@arm.com>
> Date: Fri, 17 Jan 2020 12:21:07 +0100
> As far as possible, I've made the script automatically restructure any
> existing fetch or push lines that earlier versions of the scripts may
> have created - the gcc-git-customization.sh script will convert all
> vendor refs that it can find, so it is not necessary to re-add any
> vendors you've already added.
I fail, using these instructions, trying to create a
vendor-branch named axis/cris-decc0, using git-2.11.0 from
Debian 9.
> You might, however, want to run
> git remote prune <origin>
> after running to clean up any stale upstream-refs that might still be in
> your local repo, and then
> git fetch vendors/<vendor>
> or
> git fetch <me>
> to re-populate the remotes/ structures.
(I did not use gcc-git-customization.sh or git-fetch-vendor.sh before
XXXXXX, so there's presumably nothing to clean up.)
I've done
$ ./contrib/gcc-git-customization.sh
and
$ ./contrib/git-fetch-vendor.sh --enable-push axis
> Also, for any branch you already have that tracks a personal or vendor
> branch upstream, you might need to run
> git config branch.<name>.remote <new-remote>
>
> so that merges and pushes go to the right place (I haven't attempted to
> automate this last part).
>
> For vendors, the new structure means that
>
> git checkout -b <vendor>/<branch> remotes/vendors/<vendor>/<branch>
>
> will correctly set up a remote tracking branch.
On master, doing
$ git checkout -b axis/cris-decc0 remotes/vendors/axis/cris-decc0
fatal: Cannot update paths and switch to branch 'axis/cris-decc0' at the same time.
Did you intend to checkout 'remotes/vendors/axis/cris-decc0' which can not be resolved as commit?
My .git/config looks like this after the gcc-descr and
gcc-undescr lines:
[diff "md"]
xfuncname = ^\\(define.*$
[gcc-config]
upstream = origin
user = hp
userpfx = me
[remote "me"]
url = git+ssh://gcc.gnu.org/git/gcc.git
fetch = +refs/users/hp/heads/*:refs/remotes/me/*
fetch = +refs/users/hp/tags/*:refs/tags/me/*
push = refs/heads/me/*:refs/users/hp/heads/*
[remote "vendors/axis"]
url = git+ssh://gcc.gnu.org/git/gcc.git
fetch = +refs/vendors/axis/heads/*:refs/remotes/vendors/axis/*
fetch = +refs/vendors/axis/tags/*:refs/tags/vendors/axis/*
push = refs/heads/axis/*:refs/vendors/axis/heads/*
Bug in script (undiscovered because e.g. everybody else uses an
existing vendor or branch) or PEBKAC?
I'm past git 101, maybe even intermediate, for some definition
thereof, but this refs-configury is way beyond my
error-correction capabilities; I can't tell typos.
I'm about to create a devel/ branch instead, as that seems way
simpler than playing hide-and-seek like this, but that will make
everyone else fetch an additional blob that may be several
kilobytes (compressed). Probably much larger than this email. :)
brgds, H-P
next prev parent reply other threads:[~2020-01-21 1:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 17:35 Richard Earnshaw (lists)
2020-01-17 12:08 ` [v2] " Richard Earnshaw (lists)
2020-01-20 10:43 ` Richard Earnshaw (lists)
2020-01-21 2:07 ` Hans-Peter Nilsson [this message]
2020-01-21 2:19 ` Hans-Peter Nilsson
2020-01-21 10:54 ` Richard Earnshaw (lists)
2020-01-21 11:20 ` Richard Earnshaw (lists)
2020-01-21 14:09 ` [patch] contrib: script to create a new vendor branch Richard Earnshaw (lists)
2020-01-21 14:14 ` Richard Earnshaw (lists)
2020-01-22 0:51 ` Hans-Peter Nilsson
2020-01-22 10:18 ` Richard Earnshaw (lists)
2020-01-22 10:23 ` Richard Earnshaw (lists)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202001210147.00L1lvmL021141@ignucius.se.axis.com \
--to=hp@axis.com \
--cc=Richard.Earnshaw@arm.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).