Repository: hadoop Updated Branches: refs/heads/HDFS-7285-merge 8c7ca4f45 -> acbe42a85 (forced update)
HADOOP-12244. recover broken rebase during precommit (aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b73181f1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b73181f1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b73181f1 Branch: refs/heads/HDFS-7285-merge Commit: b73181f18702f9dc2dfc9d3cdb415b510261e74c Parents: 53bef9c Author: Allen Wittenauer <a...@apache.org> Authored: Thu Aug 13 12:29:19 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Thu Aug 13 12:29:19 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 6 ++++++ hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b73181f1/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index efcd614..a3cdc85 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -947,6 +947,12 @@ function git_checkout # we need to explicitly fetch in case the # git ref hasn't been brought in tree yet 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 if [[ $? != 0 ]]; then hadoop_error "ERROR: git pull is failing" http://git-wip-us.apache.org/repos/asf/hadoop/blob/b73181f1/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c80be05..5d8d20d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -504,6 +504,8 @@ Trunk (Unreleased) HADOOP-12009. Clarify FileSystem.listStatus() sorting order & fix FileSystemContractBaseTest:testListStatus. (J.Andreina via jghoman) + HADOOP-12244. recover broken rebase during precommit (aw) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd)
