Re: Updated handling of the git repositories
Miklos Vajna <[email protected]> Fri, 27 Aug 2010 02:23:46 +0200
| Newsgroups | gmane.comp.gnome.ximian.openoffice |
|---|---|
| Message-ID | <[email protected]> |
On Thu, Aug 26, 2010 at 05:41:26PM +0200, Jan Holesovsky <[email protected]> wrote: > OK - now, after some fixes I am much more confident in this framework, > and ask everyone to configure with --with-git for the development. > Please remove your build/ooo330-m4, it will be safer to start anew. For > building packages, Petr will tag the Alpha 0 very soon (in all the > repositories). I'm attaching a related fix - git remote show is not meant to be used by scripts. OK to push? Thanks.
0001-configure-don-t-use-git-remote-show.patch
(text/plain, 844 B)
From 10703c51bd054e714590573a186cb3927b504562 Mon Sep 17 00:00:00 2001 From: Miklos Vajna <[email protected]> Date: Fri, 27 Aug 2010 02:20:01 +0200 Subject: [PATCH] configure: don't use git remote show Its output is not guaranteed to be stable, use git config instead. --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 759e14b..e30ce36 100644 --- a/configure.in +++ b/configure.in @@ -1583,7 +1583,7 @@ else if test "$with_git" != "yes" ; then OOO_GIT="$with_git" else - guess=`git remote show -n origin | grep 'Fetch URL: ' | sed -e 's/^.*Fetch URL: //' -e 's#/ooo-build$##'` + guess=`git config remote.origin.url | sed 's#/ooo-build$##'` if test -n "$guess" ; then OOO_GIT="$guess" fi -- 1.7.0
signature.asc
(application/pgp-signature, 198 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkx3BZIACgkQe81tAgORUJb/MQCgi68TRup6uZd+FCuI9vMGQIct UBUAn3y6SFwTVHljnx7N3a6onCLvv9Y7 =WDZy -----END PGP SIGNATURE-----