Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12244. recover broken rebase during precommit (aw)

This commit is contained in:
Allen Wittenauer 2015-08-13 12:29:19 -07:00
parent 53bef9c5b9
commit b73181f187
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev-support/test-patch.sh
View File

@ -947,6 +947,12 @@ function git_checkout
# we need to explicitly fetch in case the # we need to explicitly fetch in case the
# git ref hasn't been brought in tree yet # git ref hasn't been brought in tree yet
if [[ ${OFFLINE} == false ]]; then if [[ ${OFFLINE} == false ]]; then
if [[ -f .git/rebase-apply ]]; then
hadoop_error "ERROR: previous rebase failed. Aborting it."
${GIT} rebase --abort
fi
${GIT} pull --rebase ${GIT} pull --rebase
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
hadoop_error "ERROR: git pull is failing" hadoop_error "ERROR: git pull is failing"

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -504,6 +504,8 @@ Trunk (Unreleased)
HADOOP-12009. Clarify FileSystem.listStatus() sorting order & fix HADOOP-12009. Clarify FileSystem.listStatus() sorting order & fix
FileSystemContractBaseTest:testListStatus. (J.Andreina via jghoman) FileSystemContractBaseTest:testListStatus. (J.Andreina via jghoman)
HADOOP-12244. recover broken rebase during precommit (aw)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd) HADOOP-7761. Improve the performance of raw comparisons. (todd)