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

HADOOP-12018. smart-apply-patch.sh fails if the patch edits CR+LF files and is created by 'git diff --no-prefix'. Contributed by Kengo Seki. 

(cherry picked from commit b5f0d294f8)
This commit is contained in:
Akira Ajisaka 2015-06-04 11:14:55 +09:00
parent ee3002933a
commit e02df98f7d
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
# #
# Determine if the patch file is a git diff file with prefixes. # Determine if the git diff patch file has prefixes.
# These files are generated via "git diff" *without* the --no-prefix option. # These files are generated via "git diff" *without* the --no-prefix option.
# #
# We can apply these patches more easily because we know that the a/ and b/ # We can apply these patches more easily because we know that the a/ and b/
@ -21,28 +21,13 @@
# And of course, we know that the patch file was generated using git, so we # And of course, we know that the patch file was generated using git, so we
# know git apply can handle it properly. # know git apply can handle it properly.
# #
# Arguments: file name. # Arguments: git diff file name.
# Return: 0 if it is a git diff; 1 otherwise. # Return: 0 if it is a git diff with prefix; 1 otherwise.
# #
is_git_diff_with_prefix() { has_prefix() {
DIFF_TYPE="unknown" awk '/^diff --git / { if ($3 !~ "^a/" || $4 !~ "^b/") { exit 1 } }
while read -r line; do /^\+{3}|-{3} / { if ($2 !~ "^[ab]/" && $2 !~ "^/dev/null") { exit 1 } }' "$1"
if [[ "$line" =~ ^diff\ ]]; then return $?
if [[ "$line" =~ ^diff\ \-\-git ]]; then
DIFF_TYPE="git"
else
return 1 # All diff lines must be diff --git lines.
fi
fi
if [[ "$line" =~ ^\+\+\+\ ]] ||
[[ "$line" =~ ^\-\-\-\ ]]; then
if ! [[ "$line" =~ ^....[ab]/ || "$line" =~ ^..../dev/null ]]; then
return 1 # All +++ and --- lines must start with a/ or b/ or be /dev/null.
fi
fi
done < $1
[ x$DIFF_TYPE == x"git" ] || return 1
return 0 # return true (= 0 in bash)
} }
PATCH_FILE=$1 PATCH_FILE=$1
@ -100,15 +85,21 @@ if [[ ${PATCH_FILE} =~ ^http || ${PATCH_FILE} =~ ${ISSUE_RE} ]]; then
PATCH_FILE="${PFILE}" PATCH_FILE="${PFILE}"
fi fi
# Special case for git-diff patches without --no-prefix # Case for git-diff patches
if is_git_diff_with_prefix "$PATCH_FILE"; then if grep -q "^diff --git" "${PATCH_FILE}"; then
GIT_FLAGS="--binary -p1 -v" GIT_FLAGS="--binary -v"
if [[ -z $DRY_RUN ]]; then if has_prefix "$PATCH_FILE"; then
GIT_FLAGS="$GIT_FLAGS --stat --apply " GIT_FLAGS="$GIT_FLAGS -p1"
echo Going to apply git patch with: git apply "${GIT_FLAGS}"
else else
GIT_FLAGS="$GIT_FLAGS --check " GIT_FLAGS="$GIT_FLAGS -p0"
fi fi
if [[ -z $DRY_RUN ]]; then
GIT_FLAGS="$GIT_FLAGS --stat --apply"
echo Going to apply git patch with: git apply "${GIT_FLAGS}"
else
GIT_FLAGS="$GIT_FLAGS --check"
fi
# shellcheck disable=SC2086
git apply ${GIT_FLAGS} "${PATCH_FILE}" git apply ${GIT_FLAGS} "${PATCH_FILE}"
exit $? exit $?
fi fi

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

@ -330,6 +330,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh
is modified. (Kengo Seki via aajisaka) is modified. (Kengo Seki via aajisaka)
HADOOP-12018. smart-apply-patch.sh fails if the patch edits CR+LF files
and is created by 'git diff --no-prefix'. (Kengo Seki via aajisaka)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES