hadoop-common-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Kengo Seki (JIRA)" <j...@apache.org>
Subject [jira] [Updated] (HADOOP-12018) smart-apply-patch.sh fails if the patch edits CR+LF files and is created by 'git diff --no-prefix'
Date Fri, 22 May 2015 16:11:17 GMT

     [ https://issues.apache.org/jira/browse/HADOOP-12018?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Kengo Seki updated HADOOP-12018:
--------------------------------
    Attachment: HADOOP-12018.001.patch

I prefer the plan 1. The root problem is that smart-apply-patch can't recognise the patch
created by 'git diff --no-prefix' as git's one. This patch enables smart-apply-patch to detect
it and use 'git apply -p0' rather than 'patch -p0'.

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