Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1AA418FE3 for ; Mon, 8 Jun 2015 17:19:14 +0000 (UTC) Received: (qmail 61779 invoked by uid 500); 8 Jun 2015 17:19:01 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 61607 invoked by uid 500); 8 Jun 2015 17:19:01 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 60236 invoked by uid 99); 8 Jun 2015 17:19:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 17:19:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79666E0044; Mon, 8 Jun 2015 17:19:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjshen@apache.org To: common-commits@hadoop.apache.org Date: Mon, 08 Jun 2015 17:19:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [27/50] hadoop git commit: HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. (Contributed by Kengo Seki) 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/e72a346e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e72a346e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e72a346e Branch: refs/heads/YARN-2928 Commit: e72a346e1ea6565c4f87c6ed0afd33fa09e1c8da Parents: 94db4f2 Author: Arpit Agarwal Authored: Thu Jun 4 10:53:16 2015 -0700 Committer: Zhijie Shen Committed: Mon Jun 8 09:56:57 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/e72a346e/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/e72a346e/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