From de5bf9d5caf493f42f48a2b333fd5636fcf33790 Mon Sep 17 00:00:00 2001
From: Aaron Myers <atm@apache.org>
Date: Wed, 15 Jun 2011 22:16:36 +0000
Subject: [PATCH] HADOOP-7390. VersionInfo not generated properly in git after
 unsplit. (todd via atm)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1136220 13f79535-47bb-0310-9956-ffa450edef68
---
 common/CHANGES.txt        | 3 +++
 common/src/saveVersion.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/CHANGES.txt b/common/CHANGES.txt
index 8eba79e71f..4995bb9a45 100644
--- a/common/CHANGES.txt
+++ b/common/CHANGES.txt
@@ -309,6 +309,9 @@ Trunk (unreleased changes)
     HADOOP-7389. Use of TestingGroups by tests causes subsequent tests to fail.
     (atm via tomwhite)
 
+    HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd
+    via atm)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/common/src/saveVersion.sh b/common/src/saveVersion.sh
index 7b8dfdf0f5..aef6967e17 100755
--- a/common/src/saveVersion.sh
+++ b/common/src/saveVersion.sh
@@ -26,7 +26,7 @@ build_dir=$2
 user=`whoami | tr '\n\r' '\n'`
 date=`date`
 cwd=`pwd`
-if [ -d .git ]; then
+if git rev-parse HEAD 2>/dev/null > /dev/null ; then
   revision=`git log -1 --pretty=format:"%H"`
   hostname=`hostname`
   branch=`git branch | sed -n -e 's/^* //p'`