• Bug#1005765: dgit doesn't handle upstream files with CRLF well

    From Ian Jackson@21:1/5 to All on Fri Feb 9 12:40:02 2024
    Control: close -1

    Thanks for the report. But, having reviewed this bug, I think all of
    dgit's behaviour here is correct.

    What's wrong is that the git tree and .orig have mismatched line
    ending conventions.

    I've conjectured that this is tolerated by other tooling (eg
    git-buildpackage) because git has been configured to do automatic line
    ending conversion. That's not a good approach, because that
    configuration is local to particular git trees, so different people
    see different working trees for the same commit.

    Probably, the git tree should be changed to match the upstream source
    code. The other alternative is not to use the upstream .orig, but
    rather use one that you've converted to Unix line endings.

    Ian.

    --
    Ian Jackson <ijackson@chiark.greenend.org.uk> These opinions are my own.

    Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
    that is a private address which bypasses my fierce spamfilter.

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)