hadoop-common-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Hudson (JIRA)" <j...@apache.org>
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'
Date Thu, 04 Jun 2015 02:26:38 GMT

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

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

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


> 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)

Mime
View raw message