Small create-pull-request fix
cover Small create-pull-request fix
The following changes since commit 26e5e5feb695864b11e47e24017e254c28f14494:
Improve handling of 'all' architecture recipes and their interaction with sstate (2011-05-31 12:56:38 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
Martin Jansa (1):
create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'
scripts/create-pull-request | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.5.3
PATCH 1/1 create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'
--- scripts/create-pull-request | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/create-pull-request +1 -1
@@ -102,7 +102,7 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do case "$REMOTE_URL" in *@*) USER_RE="[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?" - PROTO_RE="[a-z][a-z]*://" + PROTO_RE="[a-z][a-z+]*://" GIT_RE="\(^\($PROTO_RE\)\?$USER_RE@\)\([^:/]*\)[:/]\(.*\)" REMOTE_URL=${REMOTE_URL%.git} REMOTE_REPO=$(echo $REMOTE_URL | sed "s#$GIT_RE#\4#")
Signature · 1 line
1.7.5.3
Re: [PATCH 1/1] create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'
Hi Martin,
No objection if this is a valid URL. I didn't include this because 1) I didn't know about it and 2) it isn't listed in the git pull man page, which is what I developed to. Is git+ssh... equivalent to ssh:// ?
As a minor nit, please include a body message for anything more complicated than whitespace or typographical fixes.
Thanks,
--
Darren
Quoted 18 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- scripts/create-pull-request | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)scripts/create-pull-request +1
-1@@ -102,7 +102,7 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do case "$REMOTE_URL" in *@*) USER_RE="[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?" - PROTO_RE="[a-z][a-z]*://" + PROTO_RE="[a-z][a-z+]*://" GIT_RE="\(^\($PROTO_RE\)\?$USER_RE@\)\([^:/]*\)[:/]\(.*\)" REMOTE_URL=${REMOTE_URL%.git} REMOTE_REPO=$(echo $REMOTE_URL | sed "s#$GIT_RE#\4#")
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCH 1/1] create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'
Quoted 1 line · Darren Hart
Hi Martin,
Hi Darren,
Quoted 3 lines
No objection if this is a valid URL. I didn't include this because 1) I didn't know about it and 2) it isn't listed in the git pull man page, which is what I developed to. Is git+ssh... equivalent to ssh:// ?
before this change my pull requests had url like this
are available in the git repository at:
git+ssh://[email protected]/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/git+ssh://[email protected]/meta-openembedded-contrib/log/?h=jansa/meta-oe
because RE wasn't matching my URL at all
OE @ ~/shr-core/openembedded-core $ git config remote.contrib.url git+ssh://[email protected]/openembedded-core-contrib
IMHO this is equivalent to ssh:// or git@ without protocol but haven't checked documentation to be sure. But I'm sure this is valid and that this works right (as I'm able to push to contrib).
Quoted 2 lines
As a minor nit, please include a body message for anything more complicated than whitespace or typographical fixes.
I use git+ssh:// for many projects so I'm used to it, so I expected that this is widely used and this patch would be clear enough.
Regards,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 1/1] create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'
Quoted 14 lines · Martin Jansa
Quoted 1 line · Darren Hart
Hi Martin,
Hi Darren,
Quoted 3 lines
No objection if this is a valid URL. I didn't include this because 1) I didn't know about it and 2) it isn't listed in the git pull man page, which is what I developed to. Is git+ssh... equivalent to ssh:// ?
before this change my pull requests had url like this
are available in the git repository at:
git+ssh://[email protected]/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/git+ssh://[email protected]/meta-openembedded-contrib/log/?h=jansa/meta-oe
Quoted 9 lines
because RE wasn't matching my URL at all
OE @ ~/shr-core/openembedded-core $ git config remote.contrib.url git+ssh://[email protected]/openembedded-core-contrib
IMHO this is equivalent to ssh:// or git@ without protocol but haven't checked documentation to be sure. But I'm sure this is valid and that this works right (as I'm able to push to contrib).
I'm sure the patch is fine - I was just surprised git pull didn't document the URL. It's already been pulled as well I believe.
Quoted 5 lines
Quoted 2 lines
As a minor nit, please include a body message for anything more complicated than whitespace or typographical fixes.
I use git+ssh:// for many projects so I'm used to it, so I expected that this is widely used and this patch would be clear enough.
As I said, it's a nit, but it is consistent with guidelines used in many other projects. Cramming too much into the subject line makes the git log hard to read - especially as git doesn't wrap long lines - perhaps due to the prejudices of the authors ;-) Yours doesn't truncate, but it comes close. Anyway, dead horse and all that.
Thanks for the fix.
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Saul Wold
AppliedQuoted 8 lines · Martin Jansa
The following changes since commit
26e5e5feb695864b11e47e24017e254c28f14494:Improve handling of 'all' architecture recipes and their interaction with sstate (2011-05-31 12:56:38 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribjansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
Quoted 6 lines
Martin Jansa (1):
create-pull-request: allow '+' in gitPROTO_RE, ie for 'git+ssh://'scripts/create-pull-request | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Merged into oe-core
Thanks
Sau!