[gimp/soc-2010-cage] fix for the generation of git-version.h when the last commit is a merge

[Michael Muré <mmure src gnome org>]

commit 8701add709b6d50fe11ad2e084691f165df2bf76
Author: Michael Muré <batolettre gmail com>
Date:   Wed Jun 30 23:34:49 2010 +0200

    fix for the generation of git-version.h when the last commit is a merge

 app/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index c387d58..ebebdd3 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 log HEAD^..HEAD --pretty=format:%H -n 1`\"" > "$  tmp"; \
 	elif test ! -f "$@"; then \
 	  echo "#define GIMP_GIT_VERSION \"Unknown, shouldn't happen\"" > "$  tmp"; \
 	fi