Mailing-List: contact common-issues-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-issues@hadoop.apache.org
Date: Thu, 4 Jun 2015 11:48:44 +0000 (UTC)
From: "Hudson (JIRA)" <jira@apache.org>
To: common-issues@hadoop.apache.org
Message-ID: <JIRA.12832049.1432272765000.10310.1433418524345@Atlassian.JIRA>
In-Reply-To: <JIRA.12832049.1432272765000@Atlassian.JIRA>
References: <JIRA.12832049.1432272765000@Atlassian.JIRA>
 <JIRA.12832049.1432272765464@arcas>
Subject: [jira] [Commented] (HADOOP-12018) smart-apply-patch.sh fails if the
 patch edits CR+LF files and is created by 'git diff --no-prefix'
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit


    [ https://issues.apache.org/jira/browse/HADOOP-12018?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14572619#comment-14572619 ] 

Hudson commented on HADOOP-12018:
---------------------------------

FAILURE: Integrated in Hadoop-Yarn-trunk #948 (See [https://builds.apache.org/job/Hadoop-Yarn-trunk/948/])
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. (aajisaka: rev b5f0d294f828240ea9a2395db94492e87af0260b)
* hadoop-common-project/hadoop-common/CHANGES.txt
* dev-support/smart-apply-patch.sh


> smart-apply-patch.sh fails if the patch edits CR+LF files and is created by 'git diff --no-prefix'
> --------------------------------------------------------------------------------------------------
>
>                 Key: HADOOP-12018
>                 URL: https://issues.apache.org/jira/browse/HADOOP-12018
>             Project: Hadoop Common
>          Issue Type: Bug
>          Components: build
>            Reporter: Akira AJISAKA
>            Assignee: Kengo Seki
>            Priority: Minor
>             Fix For: 2.8.0
>
>         Attachments: HADOOP-12018.001.patch, HADOOP-12018.002.patch, HADOOP-12018.003.patch, HADOOP-12018.004.patch, HADOOP-12018.test-noprefix.patch, HADOOP-12018.test-noprefix.patch
>
>
> If the patch edits a file includes CR+LF and created by "git diff --no-prefix", smart-apply-patch.sh fails to patch. smart-apply-patch.sh checks if the patch is created by "git diff" or "patch", however, if a patch is created by "git diff --no-prefix", smart-apply-patch.sh detects the patch is created by "patch" command. That's why https://builds.apache.org/job/PreCommit-HADOOP-Build/6800/console fails.
> A workaround is to use "git diff" for creating patch if a file includes CR+LF is edited.


--
This message was sent by Atlassian JIRA
(v6.3.4#6332)