浏览代码

HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd via atm)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1138278 13f79535-47bb-0310-9956-ffa450edef68
Luke Lu 14 年之前
父节点
当前提交
37412599af
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 3 0
      common/CHANGES.txt
  2. 1 1
      common/src/saveVersion.sh

+ 3 - 0
common/CHANGES.txt

@@ -142,6 +142,9 @@ Trunk (unreleased changes)
     HADOOP-7082. Configuration.writeXML should not hold lock while outputting.
     (todd)
 
+    HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd
+    via atm)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 1 - 1
common/src/saveVersion.sh

@@ -26,7 +26,7 @@ build_dir=$2
 user=`whoami`
 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'`