-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/05/2011 01:37 PM, Marcin Slusarz wrote: > Reviewed-by: Dan Nicholson <dbn.li...@gmail.com> > Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
I pushed both patches to Mesa master. Thanks. > --- > bin/extract_git_sha1 | 10 ++++++++-- > src/mesa/main/.gitignore | 1 + > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/bin/extract_git_sha1 b/bin/extract_git_sha1 > index e6e6731..5e635d4 100755 > --- a/bin/extract_git_sha1 > +++ b/bin/extract_git_sha1 > @@ -1,10 +1,16 @@ > #!/bin/sh > -touch src/mesa/main/git_sha1.h > +if [ ! -f src/mesa/main/git_sha1.h ]; then > + touch src/mesa/main/git_sha1.h > +fi > + > if which git > /dev/null; then > # Extract the 7-digit "short" SHA1 for the current HEAD, convert > # it to a string, and wrap it in a #define. This is used in > # src/mesa/main/version.c to put the GIT SHA1 in the GL_VERSION string. > git log -n 1 --oneline |\ > sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ > - > src/mesa/main/git_sha1.h > + > src/mesa/main/git_sha1.h.tmp > + if ! cmp -s src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h; then > + mv src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h > + fi > fi > diff --git a/src/mesa/main/.gitignore b/src/mesa/main/.gitignore > index e48030e..2575f44 100644 > --- a/src/mesa/main/.gitignore > +++ b/src/mesa/main/.gitignore > @@ -3,3 +3,4 @@ api_exec_es2.c > get_es1.c > get_es2.c > git_sha1.h > +git_sha1.h.tmp -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk3DDaQACgkQX1gOwKyEAw9JiQCfX/m+F4JCHd1wAmuvdXbzohW1 RikAn0C8fFd0nCZPVdWYowSlXmAYJQza =7hUZ -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
