big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. (Contributed by Kengo Seki)

Browse Source
This commit is contained in:
Arpit Agarwal 2015-06-04 10:53:16 -07:00
parent 6ad4e59cfc
commit 8266dae0e9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev-support/smart-apply-patch.sh
View File

@ -101,7 +101,10 @@ if grep -q "^diff --git" "${PATCH_FILE}"; then
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
git apply ${GIT_FLAGS} "${PATCH_FILE}" 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 fi
# Come up with a list of changed files into $TMP # Come up with a list of changed files into $TMP

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

@ -820,6 +820,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12019. update BUILDING.txt to include python for 'mvn site' HADOOP-12019. update BUILDING.txt to include python for 'mvn site'
in windows (vinayakumarb) in windows (vinayakumarb)
HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible.
(Kengo Seki via Arpit Agarwal)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES