Browse Source

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
Aaron Myers 14 years ago
parent
commit
de5bf9d5ca
2 changed files with 4 additions and 1 deletions
  1. 3 0
      common/CHANGES.txt
  2. 1 1
      common/src/saveVersion.sh

+ 3 - 0
common/CHANGES.txt

@@ -309,6 +309,9 @@ Trunk (unreleased changes)
     HADOOP-7389. Use of TestingGroups by tests causes subsequent tests to fail.
     HADOOP-7389. Use of TestingGroups by tests causes subsequent tests to fail.
     (atm via tomwhite)
     (atm via tomwhite)
 
 
+    HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd
+    via atm)
+
 Release 0.22.0 - Unreleased
 Release 0.22.0 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 1 - 1
common/src/saveVersion.sh

@@ -26,7 +26,7 @@ build_dir=$2
 user=`whoami | tr '\n\r' '\n'`
 user=`whoami | tr '\n\r' '\n'`
 date=`date`
 date=`date`
 cwd=`pwd`
 cwd=`pwd`
-if [ -d .git ]; then
+if git rev-parse HEAD 2>/dev/null > /dev/null ; then
   revision=`git log -1 --pretty=format:"%H"`
   revision=`git log -1 --pretty=format:"%H"`
   hostname=`hostname`
   hostname=`hostname`
   branch=`git branch | sed -n -e 's/^* //p'`
   branch=`git branch | sed -n -e 's/^* //p'`