Uploaded image for project: 'Hadoop Common'
  1. Hadoop Common
  2. HADOOP-12018

smart-apply-patch.sh fails if the patch edits CR+LF files and is created by 'git diff --no-prefix'

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Minor
    • Resolution: Fixed
    • None
    • 2.8.0, 3.0.0-alpha1
    • build
    • None
    • Reviewed

    Description

      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.

      Attachments

        1. HADOOP-12018.test-noprefix.patch
          162 kB
          Akira Ajisaka
        2. HADOOP-12018.test-noprefix.patch
          162 kB
          Akira Ajisaka
        3. HADOOP-12018.004.patch
          3 kB
          Kengo Seki
        4. HADOOP-12018.003.patch
          3 kB
          Kengo Seki
        5. HADOOP-12018.002.patch
          3 kB
          Kengo Seki
        6. HADOOP-12018.001.patch
          2 kB
          Kengo Seki

        Issue Links

          Activity

            People

              sekikn Kengo Seki
              aajisaka Akira Ajisaka
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: