[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2305-g2383a56

[Sandro Santilli]

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 "Gnash".

The branch, master has been updated
       via  2383a5618a88db2c94c3b593a12ed020b8657bea (commit)
      from  bed373ff164acbe8ac56ee340714ed00ce1c3aca (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=2383a5618a88db2c94c3b593a12ed020b8657bea


commit 2383a5618a88db2c94c3b593a12ed020b8657bea
Author: Nutchanon Wetchasit <address@hidden>
Date:   Wed Mar 8 11:06:36 2017 +0100

    Obtain branch info from "git symbolic-ref" instead of "git branch".
    
    See bug #50462 <https://savannah.gnu.org/bugs/?50462>

diff --git a/Makefile.am b/Makefile.am
index da605cc..2aa8d8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # 
-#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-#   Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+#   2015, 2017 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -158,7 +158,11 @@ revno.h:
             echo "Getting build info for revno.h"; \
             revno="`cd $(top_srcdir) ; $(GIT) rev-list HEAD | wc -l`"; \
             comm_id="`cd $(top_srcdir) ; $(GIT) rev-parse --short HEAD`"; \
-            nick="`cd $(top_srcdir) ; $(GIT) branch | grep '^\*' | cut -d ' ' 
-f 2`"; \
+            nick="`cd $(top_srcdir) ; $(GIT) symbolic-ref -q HEAD`"; \
+            nick="`basename "$${nick}"`"; \
+            if test -z "$${nick}"; then \
+                  nick="none"; \
+            fi; \
          fi \
         else \
           if test \! -f revno.h; then \

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

Summary of changes:
 Makefile.am | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash