The diff view does not handle CR line endings in files gracefully

XMLWordPrintable

    • 10

      The diff view lets git itself decide on the correct line endings to use, but the lines can themselves contain line endings of a different format leading to multi-line lines which the UI displays badly.

      We should either escape the other line endings or let the UI handle multi-line lines.

      An example

      Line 1: some text <mac line ending> some more text <mac line ending><linux line ending>
Line 2: some text <mac line ending> some more text <mac line ending><linux line ending>

      The above would currently be displayed with "some more text" from line 1 on top of "some text" from line 2

      This could be displayed as:

      Line 1: some text ^M some more text ^M
Line 2: some text ^M some more text ^M

      or 

      Line 1: some text
Line 1: some more text
Line 2: some text
Line 2: some more text

        1. diff-view.png
          diff-view.png
          9 kB
        2. image-2017-04-18-15-10-54-473.png
          image-2017-04-18-15-10-54-473.png
          57 kB
        3. source-view.png
          source-view.png
          4 kB

            Assignee:
            Marcin
            Reporter:
            ThomasA
            Votes:
            3 Vote for this issue
            Watchers:
            18 Start watching this issue

              Created:
              Updated:
              Resolved: