[PATCH] git urls: prefix with GIT_PROTO_PREFIX

[PATCH] git urls: prefix with GIT_PROTO_PREFIX

[Ian Jackson]

This allows the prefixing of all git clone and fetch URLs with
a single fixed string.  This could be used to:
 - clone from a local tree /path/to/something/git:/whatever/thing
 - use a cacheing git proxy such as found in chiark-utils

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Config.mk                         |    8 ++++----
 tools/firmware/etherboot/Makefile |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Config.mk b/Config.mk
index 2bb8dcc..da417a9 100644
--- a/Config.mk
+++ b/Config.mk
@@ -252,10 +252,10 @@ QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git
 QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git
 SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
 else
-OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
-QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
-QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git
-SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
+OVMF_UPSTREAM_URL ?= $(GIT_PROTO_PREFIX)git://xenbits.xen.org/ovmf.git
+QEMU_UPSTREAM_URL ?= $(GIT_PROTO_PREFIX)git://xenbits.xen.org/qemu-upstream-unstable.git
+QEMU_TRADITIONAL_URL ?= $(GIT_PROTO_PREFIX)git://xenbits.xen.org/qemu-xen-unstable.git
+SEABIOS_UPSTREAM_URL ?= $(GIT_PROTO_PREFIX)git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
 QEMU_UPSTREAM_REVISION ?= master
diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index a0578d2..e67d862 100644
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -7,7 +7,7 @@ include Config
 ifeq ($(GIT_HTTP),y)
 IPXE_GIT_URL ?= http://git.ipxe.org/ipxe.git
 else
-IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git
+IPXE_GIT_URL ?= $(GIT_PROTO_PREFIX)git://git.ipxe.org/ipxe.git
 endif
 
 IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e
-- 
1.7.10.4

Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX

[Ian Campbell]

On Tue, 2014-09-23 at 18:56 +0100, Ian Jackson wrote:
> This allows the prefixing of all git clone and fetch URLs with
> a single fixed string.  This could be used to:
>  - clone from a local tree /path/to/something/git:/whatever/thing
>  - use a cacheing git proxy such as found in chiark-utils

Is this intended as a for-personal-use version of the munging osstest
does?

I've no problem with the patch but two idle thoughts:

Should the default be "git://" (and that prefix dropped from the values)
to reduce the odd naming requirements for local trees?

Could this be done globally for a user via .gitconfig and pullInsteadOf?
Perhaps with:
[url "git://"]
	pullInsteadOf = "/path/to/something/git:/"
or (more usefully perhaps) the equivalent proxy rune?

Ian.

Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX"):
> On Tue, 2014-09-23 at 18:56 +0100, Ian Jackson wrote:
> > This allows the prefixing of all git clone and fetch URLs with
> > a single fixed string.  This could be used to:
> >  - clone from a local tree /path/to/something/git:/whatever/thing
> >  - use a cacheing git proxy such as found in chiark-utils
> 
> Is this intended as a for-personal-use version of the munging osstest
> does?

I just used it like that to test George's tarball series.
osstest could probably usefully use it too.

> I've no problem with the patch but two idle thoughts:
> 
> Should the default be "git://" (and that prefix dropped from the values)
> to reduce the odd naming requirements for local trees?

Maybe.  I decided not, because the way I did it makes the actual usual
URLs nice and clear.

> Could this be done globally for a user via .gitconfig and pullInsteadOf?
> Perhaps with:
> [url "git://"]
> 	pullInsteadOf = "/path/to/something/git:/"
> or (more usefully perhaps) the equivalent proxy rune?

You would have to list all of the urls.  There isn't a formal way to
extract them from the xen.git tree (there's git grep and sed, but
that's pretty yucky and not necessary reliable).

Ian.

Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX

[Ian Campbell]

On Wed, 2014-09-24 at 15:11 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX"):
> > On Tue, 2014-09-23 at 18:56 +0100, Ian Jackson wrote:
> > > This allows the prefixing of all git clone and fetch URLs with
> > > a single fixed string.  This could be used to:
> > >  - clone from a local tree /path/to/something/git:/whatever/thing
> > >  - use a cacheing git proxy such as found in chiark-utils
> > 
> > Is this intended as a for-personal-use version of the munging osstest
> > does?
> 
> I just used it like that to test George's tarball series.
> osstest could probably usefully use it too.
> 
> > I've no problem with the patch but two idle thoughts:
> > 
> > Should the default be "git://" (and that prefix dropped from the values)
> > to reduce the odd naming requirements for local trees?
> 
> Maybe.  I decided not, because the way I did it makes the actual usual
> URLs nice and clear.

That's a good argument.

> > Could this be done globally for a user via .gitconfig and pullInsteadOf?
> > Perhaps with:
> > [url "git://"]
> > 	pullInsteadOf = "/path/to/something/git:/"
> > or (more usefully perhaps) the equivalent proxy rune?
> 
> You would have to list all of the urls.  There isn't a formal way to
> extract them from the xen.git tree (there's git grep and sed, but
> that's pretty yucky and not necessary reliable).

I meant the "git://" above literally, i.e. transliterate everything
starting with "git://".

Not terribly desirable for the path based usage, I'll admit.

Ian.

Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX

[Ian Jackson]

Ian Campbell writes ("Re: [PATCH] git urls: prefix with GIT_PROTO_PREFIX"):
> On Wed, 2014-09-24 at 15:11 +0100, Ian Jackson wrote:
> > You would have to list all of the urls.  There isn't a formal way to
> > extract them from the xen.git tree (there's git grep and sed, but
> > that's pretty yucky and not necessary reliable).
> 
> I meant the "git://" above literally, i.e. transliterate everything
> starting with "git://".

Oh.  I didn't know you could do that.  But I have just RTFM'd and it
appears that you could.

> Not terribly desirable for the path based usage, I'll admit.

I think I will try messing about with .gitconfig and see if this patch
is really needed.

Thanks,
Ian.