[gimp] app: Handle merge commits for git-version.h

[Martin Nordholts <martinn src gnome org>]

commit 01113ffeee4cce5e81717b2fe935a52d15f62335
Author: Martin Nordholts <martinn src gnome org>
Date:   Tue Jul 6 16:02:53 2010 +0200

    app: Handle merge commits for git-version.h
    
    Use
    
      git show-ref --hash refs/heads/master
    
    instead of
    
      git log HEAD^..HEAD --pretty=format:%H
    
    so we can handle multi-parent (merge) commits.

 app/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index c387d58..1662d5e 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -281,7 +281,7 @@ gimp-console.rc.o: gimp.rc
 # in which case the git-version.h we ship is correct.
 git-version.h: update-git-version-header
 	@if test -d "$(top_srcdir)/.git"; then \
-	  echo "#define GIMP_GIT_VERSION \"`git log HEAD^..HEAD --pretty=format:%H`\"" > "$  tmp"; \
+	  echo "#define GIMP_GIT_VERSION \"`git show-ref --hash refs/heads/master`\"" > "$  tmp"; \
 	elif test ! -f "$@"; then \
 	  echo "#define GIMP_GIT_VERSION \"Unknown, shouldn't happen\"" > "$  tmp"; \
 	fi