You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ll...@apache.org on 2011/06/22 04:02:24 UTC

svn commit: r1138278 - in /hadoop/common/branches/MR-279/common: CHANGES.txt src/saveVersion.sh

Author: llu
Date: Wed Jun 22 02:02:24 2011
New Revision: 1138278

URL: http://svn.apache.org/viewvc?rev=1138278&view=rev
Log:
HADOOP-7390. VersionInfo not generated properly in git after unsplit. (todd via atm)

Modified:
    hadoop/common/branches/MR-279/common/CHANGES.txt
    hadoop/common/branches/MR-279/common/src/saveVersion.sh

Modified: hadoop/common/branches/MR-279/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/CHANGES.txt?rev=1138278&r1=1138277&r2=1138278&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/common/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/common/CHANGES.txt Wed Jun 22 02:02:24 2011
@@ -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

Modified: hadoop/common/branches/MR-279/common/src/saveVersion.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/common/src/saveVersion.sh?rev=1138278&r1=1138277&r2=1138278&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/common/src/saveVersion.sh (original)
+++ hadoop/common/branches/MR-279/common/src/saveVersion.sh Wed Jun 22 02:02:24 2011
@@ -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'`