From c6e13cfc6eb04e2930e60f9f4cbcf4c1c21f1b24 Mon Sep 17 00:00:00 2001 From: Dima Spivak Date: Mon, 25 Aug 2014 14:17:36 -0700 Subject: [PATCH] HBASE-11721 jdiff script no longer works as usage instructions indicate * Add L argument to the curl pull of JDiff to handle following redirects. * Change how Git repos are cloned to reflect how shallow clones work now. * chmod +x on the script. --- dev-support/jdiffHBasePublicAPI.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 dev-support/jdiffHBasePublicAPI.sh diff --git a/dev-support/jdiffHBasePublicAPI.sh b/dev-support/jdiffHBasePublicAPI.sh old mode 100644 new mode 100755 index b6adbbfe..10343b1 --- a/dev-support/jdiffHBasePublicAPI.sh +++ b/dev-support/jdiffHBasePublicAPI.sh @@ -150,7 +150,7 @@ scenario_template_name=hbase_jdiff_p-$PREVIOUS_BRANCH-c-$CURRENT_BRANCH.xml # Pull down JDiff tool and unpack it if [ ! -d jdiff-1.1.1-with-incompatible-option ]; then - curl -O http://cloud.github.com/downloads/tomwhite/jdiff/jdiff-1.1.1-with-incompatible-option.zip + curl -OL http://cloud.github.com/downloads/tomwhite/jdiff/jdiff-1.1.1-with-incompatible-option.zip unzip jdiff-1.1.1-with-incompatible-option.zip fi @@ -164,7 +164,7 @@ if [[ "$FIRST_SOURCE_TYPE" = "git_repo" ]]; then rm -rf p-$PREVIOUS_BRANCH mkdir -p p-$PREVIOUS_BRANCH cd p-$PREVIOUS_BRANCH - git clone --depth 1 $PREVIOUS_REPO && cd hbase && git checkout origin/$PREVIOUS_BRANCH + git clone --depth 1 --branch $PREVIOUS_BRANCH $PREVIOUS_REPO cd $JDIFF_WORKING_DIRECTORY HBASE_1_HOME=`pwd`/p-$PREVIOUS_BRANCH/hbase else @@ -180,7 +180,7 @@ if [[ "$SECOND_SOURCE_TYPE" = "git_repo" ]]; then rm -rf $JDIFF_WORKING_DIRECTORY/c-$CURRENT_BRANCH mkdir -p $JDIFF_WORKING_DIRECTORY/c-$CURRENT_BRANCH cd $JDIFF_WORKING_DIRECTORY/c-$CURRENT_BRANCH - git clone --depth 1 $CURRENT_REPO && cd hbase && git checkout origin/$CURRENT_BRANCH + git clone --depth 1 --branch $CURRENT_BRANCH $CURRENT_REPO cd $JDIFF_WORKING_DIRECTORY HBASE_2_HOME=`pwd`/c-$CURRENT_BRANCH/hbase else -- 1.8.5.2 (Apple Git-48)