Repository: hadoop Updated Branches: refs/heads/trunk 6ad4e59cf -> 8266dae0e
HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. (Contributed by Kengo Seki) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8266dae0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8266dae0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8266dae0 Branch: refs/heads/trunk Commit: 8266dae0e9404c20093daa21645d4d66d8bb7bdb Parents: 6ad4e59 Author: Arpit Agarwal <[email protected]> Authored: Thu Jun 4 10:53:16 2015 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Thu Jun 4 10:54:18 2015 -0700 ---------------------------------------------------------------------- dev-support/smart-apply-patch.sh | 5 ++++- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8266dae0/dev-support/smart-apply-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh index be29c47..ebcb660 100755 --- a/dev-support/smart-apply-patch.sh +++ b/dev-support/smart-apply-patch.sh @@ -101,7 +101,10 @@ if grep -q "^diff --git" "${PATCH_FILE}"; then fi # shellcheck disable=SC2086 git apply ${GIT_FLAGS} "${PATCH_FILE}" - exit $? + if [[ $? == 0 ]]; then + cleanup 0 + fi + echo "git apply failed. Going to apply the patch with: ${PATCH}" fi # Come up with a list of changed files into $TMP http://git-wip-us.apache.org/repos/asf/hadoop/blob/8266dae0/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 3bca0bc..942d9e9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -820,6 +820,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12019. update BUILDING.txt to include python for 'mvn site' in windows (vinayakumarb) + HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. + (Kengo Seki via Arpit Agarwal) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES
