[git] GPG-ERROR - branch, master, updated. libgpg-error-1.10-46-gb2e4d03

by Werner Koch cvs at cvs.gnupg.org
Fri Nov 16 12:22:23 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  b2e4d03c88823151aa30f8a878ad1a30618d1340 (commit)
       via  17c8c16ee2dcb33abb7fdf50c40015f1b9d13689 (commit)
      from  33459ef19989db045f6437cdb35ddc203c7b90b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b2e4d03c88823151aa30f8a878ad1a30618d1340
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 10:52:59 2012 +0100

    Improve parsing of the GIT revision number.
    
    * configure.ac (git_revision): Use git rev-parse.

diff --git a/configure.ac b/configure.ac
index ee42f9e..85f9362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,8 @@ m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
-          | awk '/^\* / {printf "%s",$3}']))
+m4_define([git_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
 m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
           [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
 AC_INIT([libgpg-error],[my_full_version], [http://bugs.gnupg.org])

commit 17c8c16ee2dcb33abb7fdf50c40015f1b9d13689
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 10:51:28 2012 +0100

    Fix non-portable use of chmod in autogen.sh.
    
    * autogen.sh: Remove option -c from chmod.

diff --git a/autogen.sh b/autogen.sh
index 596565b..bf2c490 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -256,7 +256,7 @@ if [ -d .git ]; then
     and .git/hooks/pre-commit.sample out of the way.
 EOF
       cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
-      chmod -c +x  .git/hooks/pre-commit
+      chmod +x  .git/hooks/pre-commit
   fi
   tmp=$(git config --get filter.cleanpo.clean)
   if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]

-----------------------------------------------------------------------

Summary of changes:
 autogen.sh   |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list