You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by "Hadoop QA (JIRA)" <ji...@apache.org> on 2015/06/03 07:30:49 UTC

[jira] [Commented] (HADOOP-12018) smart-apply-patch.sh fails if the patch edits CR+LF files and is created by 'git diff --no-prefix'

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

Hadoop QA commented on HADOOP-12018:
------------------------------------

\\
\\
| (x) *{color:red}-1 overall{color}* |
\\
\\
|| Vote || Subsystem || Runtime || Comment ||
| {color:red}-1{color} | patch |   0m  0s | The patch command could not apply the patch during dryrun. |
\\
\\
|| Subsystem || Report/Notes ||
| Patch URL | http://issues.apache.org/jira/secure/attachment/12737089/HADOOP-12018.test-noprefix.patch |
| Optional Tests | shellcheck |
| git revision | trunk / 806e407 |
| Console output | https://builds.apache.org/job/PreCommit-HADOOP-Build/6901/console |


This message was automatically generated.

> 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
>         Attachments: HADOOP-12018.001.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)