HADOOP-11596. Allow smart-apply-patch.sh to add new files in binary git patches (raviprak)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/13d1ba99 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/13d1ba99 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/13d1ba99 Branch: refs/heads/YARN-2928 Commit: 13d1ba9965236381e9014fce22120b999c36189a Parents: db66062 Author: Ravi Prakash <[email protected]> Authored: Tue Feb 17 11:13:47 2015 -0800 Committer: Ravi Prakash <[email protected]> Committed: Tue Feb 17 11:13:47 2015 -0800 ---------------------------------------------------------------------- dev-support/smart-apply-patch.sh | 4 ++-- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/13d1ba99/dev-support/smart-apply-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh index 3542fb4..03bc4f8 100755 --- a/dev-support/smart-apply-patch.sh +++ b/dev-support/smart-apply-patch.sh @@ -38,8 +38,8 @@ is_git_diff_with_prefix() { fi if [[ "$line" =~ ^\+\+\+\ ]] || [[ "$line" =~ ^\-\-\-\ ]]; then - if ! [[ "$line" =~ ^....[ab]/ ]]; then - return 1 # All +++ and --- lines must start with a/ or b/. + 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/13d1ba99/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 6e43872..0de835a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -612,6 +612,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11522. Update S3A Documentation. (Thomas Demoor via stevel) + HADOOP-11596. Allow smart-apply-patch.sh to add new files in binary git + patches (raviprak) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array.
