From 60322b46755d0bfedc239e3e9287f6ae625cd836 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 7 Jan 2011 20:48:18 -0500 Subject: [PATCH] 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. Change-Id: Ic9dbd9ec5f332f36cec291fc3d324db14615f831 Reviewed-on: http://gerrit.openafs.org/3627 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- build-tools/git-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/git-version b/build-tools/git-version index 6bc9a50c1b..ff55b4a403 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"