Author: shv Date: Mon Aug 22 20:38:50 2011 New Revision: 1160420 URL: http://svn.apache.org/viewvc?rev=1160420&view=rev Log: HADOOP-7390. VersionInfo not generated properly in git after unsplit. Contributed by Todd Lipcon. (todd
Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt hadoop/common/branches/branch-0.22/common/src/saveVersion.sh Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1160420&r1=1160419&r2=1160420&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Mon Aug 22 20:38:50 2011 @@ -530,6 +530,9 @@ Release 0.22.0 - Unreleased HADOOP-7514. Build fails with ClassCastException when running both mvn-install and mvn-deploy targets (Joep Rottinghuis via cos) + HADOOP-7390. VersionInfo not generated properly in git after unsplit. + (todd via shv) + Release 0.21.1 - Unreleased IMPROVEMENTS Modified: hadoop/common/branches/branch-0.22/common/src/saveVersion.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/saveVersion.sh?rev=1160420&r1=1160419&r2=1160420&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/common/src/saveVersion.sh (original) +++ hadoop/common/branches/branch-0.22/common/src/saveVersion.sh Mon Aug 22 20:38:50 2011 @@ -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'`