From: Andrew Deason <adeason@sinenomine.net>
Date: Sat, 8 Jan 2011 01:48:18 +0000 (-0500)
Subject: git-version: Do not specify --ignore-submodules
X-Git-Tag: upstream/1.6.0.pre2^2~87
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=83c6b5f79f9dc73c7e17797a544275d273e833db;p=packages%2Fo%2Fopenafs.git

git-version: Do not specify --ignore-submodules

Only new git versions reognize the --ignore-submodules option to
diff-index and diff-files. Do not pass this, to make git-version more
likely to work across different versions, as we don't have any
submodules in the tree anyway.

Reviewed-on: http://gerrit.openafs.org/3627
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 60322b46755d0bfedc239e3e9287f6ae625cd836)

Change-Id: Iae527081b431863fa1eae418b8468741f75f3f2e
Reviewed-on: http://gerrit.openafs.org/3817
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/build-tools/git-version b/build-tools/git-version
index 6bc9a50c1..ff55b4a40 100755
--- a/build-tools/git-version
+++ b/build-tools/git-version
@@ -15,8 +15,8 @@ else
     git_version=`git describe --abbrev=4 HEAD 2>/dev/null`
     if [ $? = 0 ]; then
       # Is the working tree dirty?
-      if git diff-index --quiet --cached HEAD --ignore-submodules && \
-         git diff-files --quiet --ignore-submodules ; then
+      if git diff-index --quiet --cached HEAD && \
+         git diff-files --quiet ; then
 	 :
       else
         git_version="$git_version-dirty"