• FizzyOrange@programming.dev
    link
    fedilink
    arrow-up
    27
    arrow-down
    2
    ·
    23 hours ago

    … if you have a super janky patch file workflow.

    If you are using Git like normal people do this can’t happen.

      • Kissaki@programming.dev
        link
        fedilink
        English
        arrow-up
        10
        ·
        22 hours ago

        … which arguably makes them not “normal people” (referring to the earlier comment).

        Surely, most people use different, more integrated tooling.

      • FizzyOrange@programming.dev
        link
        fedilink
        arrow-up
        3
        arrow-down
        1
        ·
        19 hours ago

        Yeah it’s mad. Tbh I don’t think GitHub PRs are the best workflow, but I absolutely know that git send-email is the worst. I tried to use it once to contribute to OpenSBI, which inexplicably also insists on it. Suffice it to say my patch was never merged…

          • FizzyOrange@programming.dev
            link
            fedilink
            arrow-up
            2
            ·
            7 hours ago

            They wanted me to make some changes and with the normal workflow that’s just git commit and git push. With git send-email I have no fucking idea and it got beyond the point where I had enough cared enough to fight the process.

  • Oinks@lemmy.blahaj.zone
    link
    fedilink
    arrow-up
    8
    ·
    edit-2
    22 hours ago

    Hooray to underspecified file formats.

    From patch(1):

    patch tries to skip any leading garbage, apply the diff, and then skip any trailing garbage. Thus you could feed an email message containing a diff listing to patch, and it should work.

    From git-am(1):

    The patch is expected to be inline, directly following the message. Any line that is of the form:

    • three-dashes and end-of-line, or
    • a line that begins with “diff -”, or
    • a line that begins with "Index: "

    is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line.

    Ideally git-am should use a better file format, but I suppose the more realistic lesson now is to never have inline diffs in Commit messages.

  • verstra@programming.dev
    link
    fedilink
    arrow-up
    7
    arrow-down
    1
    ·
    23 hours ago

    Context: this happens if you use patch(1) with patches generated by git format-patch. If you do, you should be using git am instead.