hadoop-common-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Akira AJISAKA (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 Wed, 03 Jun 2015 15:58:38 GMT

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

Akira AJISAKA commented on HADOOP-12018:
----------------------------------------

Thanks [~sekikn] for updating the patch. The one-liner looks good to me. One comment:
1. 
{code}
# Case for git-diff patches
if [[ $(head -1 "${PATCH_FILE}") =~ ^diff\ --git ]]; then
{code}
Detecting by the first line is not sufficient. Developers may upload the patch created by
{{git format-patch}}, so grepping the line starts with {{diff --git}} would be fine.

> 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.002.patch, HADOOP-12018.003.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