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.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb2903ca Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb2903ca Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb2903ca Branch: refs/heads/YARN-2928 Commit: bb2903ca235015e05eba60c1077f70f54c8de2df Parents: c439926 Author: Akira Ajisaka <aajis...@apache.org> Authored: Thu Jun 4 11:14:55 2015 +0900 Committer: Zhijie Shen <zjs...@apache.org> Committed: Mon Jun 8 09:43:16 2015 -0700 ---------------------------------------------------------------------- dev-support/smart-apply-patch.sh | 47 ++++++++------------ hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++ 2 files changed, 22 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb2903ca/dev-support/smart-apply-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh index 449fc22..be29c47 100755 --- a/dev-support/smart-apply-patch.sh +++ b/dev-support/smart-apply-patch.sh @@ -12,7 +12,7 @@ # 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. # # 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 # know git apply can handle it properly. # -# Arguments: file name. -# Return: 0 if it is a git diff; 1 otherwise. +# Arguments: git diff file name. +# Return: 0 if it is a git diff with prefix; 1 otherwise. # -is_git_diff_with_prefix() { - DIFF_TYPE="unknown" - while read -r line; do - if [[ "$line" =~ ^diff\ ]]; then - 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) +has_prefix() { + awk '/^diff --git / { if ($3 !~ "^a/" || $4 !~ "^b/") { exit 1 } } + /^\+{3}|-{3} / { if ($2 !~ "^[ab]/" && $2 !~ "^/dev/null") { exit 1 } }' "$1" + return $? } PATCH_FILE=$1 @@ -100,15 +85,21 @@ if [[ ${PATCH_FILE} =~ ^http || ${PATCH_FILE} =~ ${ISSUE_RE} ]]; then PATCH_FILE="${PFILE}" fi -# Special case for git-diff patches without --no-prefix -if is_git_diff_with_prefix "$PATCH_FILE"; then - GIT_FLAGS="--binary -p1 -v" +# Case for git-diff patches +if grep -q "^diff --git" "${PATCH_FILE}"; then + GIT_FLAGS="--binary -v" + if has_prefix "$PATCH_FILE"; then + GIT_FLAGS="$GIT_FLAGS -p1" + else + GIT_FLAGS="$GIT_FLAGS -p0" + fi if [[ -z $DRY_RUN ]]; then - GIT_FLAGS="$GIT_FLAGS --stat --apply " - echo Going to apply git patch with: git apply "${GIT_FLAGS}" + GIT_FLAGS="$GIT_FLAGS --stat --apply" + echo Going to apply git patch with: git apply "${GIT_FLAGS}" else - GIT_FLAGS="$GIT_FLAGS --check " + GIT_FLAGS="$GIT_FLAGS --check" fi + # shellcheck disable=SC2086 git apply ${GIT_FLAGS} "${PATCH_FILE}" exit $? fi http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb2903ca/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 5c1fe41..53bb150 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -814,6 +814,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh 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 INCOMPATIBLE CHANGES