HADOOP-12244. recover broken rebase during precommit (aw)
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/8369b1cc Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/8369b1cc Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/8369b1cc Branch: refs/heads/master Commit: 8369b1cc0192ecf29c8ba4a81a10ae7f29f98ef1 Parents: c8215ad Author: Allen Wittenauer <[email protected]> Authored: Thu Aug 13 12:29:19 2015 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Thu Aug 13 12:29:19 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/8369b1cc/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"
