[Gnash-commit] [SCM] Gnash branch, master, updated. e7606177a6c4c5e7a7ab4c085a7328671ca9ff24

[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  e7606177a6c4c5e7a7ab4c085a7328671ca9ff24 (commit)
       via  ba0062899082a87d9365f22e1266a477e2d1fcd0 (commit)
      from  d88461f1ec4cda3c088e7519ecc9aa43a0321f40 (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//commit/?id=e7606177a6c4c5e7a7ab4c085a7328671ca9ff24


commit e7606177a6c4c5e7a7ab4c085a7328671ca9ff24
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 15:11:37 2010 +0100

    Be even nicer on update (don't show diff output at all)

diff --git a/Makefile.am b/Makefile.am
index 98eca71..d24b5d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,7 +135,7 @@ if HAVE_GIT
         echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h.n; \
         echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h.n; \
         if test -e revno.h; then \
-            if diff -q revno.h.n revno.h; then \
+            if diff -q revno.h.n revno.h > /dev/null; then \
                 echo "Current revno.h is up to date ($${nick} $${revno})"; \
                 rm -f revno.h.n; \
             else \

http://git.savannah.gnu.org/cgit//commit/?id=ba0062899082a87d9365f22e1266a477e2d1fcd0


commit ba0062899082a87d9365f22e1266a477e2d1fcd0
Author: Sandro Santilli <address@hidden>
Date:   Wed Dec 8 15:10:06 2010 +0100

    Be nicer when reporting revno.h activity in the case in which revno.h is 
not there

diff --git a/Makefile.am b/Makefile.am
index a7baf6c..98eca71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,11 +134,16 @@ if HAVE_GIT
         nick=`$(GIT) branch | grep '^\*' | cut -d ' ' -f 2`; \
         echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h.n; \
         echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h.n; \
-        if diff -q revno.h.n revno.h; then \
-            echo "Current revno.h is up to date ($${nick} $${revno})"; \
-            rm -f revno.h.n; \
+        if test -e revno.h; then \
+            if diff -q revno.h.n revno.h; then \
+                echo "Current revno.h is up to date ($${nick} $${revno})"; \
+                rm -f revno.h.n; \
+            else \
+                echo "Updating revno.h ($${nick} $${revno})"; \
+                mv revno.h.n revno.h; \
+            fi; \
         else \
-            echo "Updating revno.h ($${nick} $${revno})"; \
+            echo "Generating revno.h ($${nick} $${revno})"; \
             mv revno.h.n revno.h; \
         fi; \
     else \

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

Summary of changes:
 Makefile.am |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash