Re: [PATCH 0/4] Link worktrees with relative paths

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Oct 6, 2024, 07:45 UTC
Message-ID: <CAPig+cQZmEdx1Th9VAHbEkJ=zm73TP7Wuda_G5CzFw7j9HTFQQ@mail.gmail.com>
In-Reply-To: <AtSpzKynOkmMPZ3bR4qx-eA93Xo-1miPCIQSxIKP534tD-qpDU1AI74vqB78RsukQ0XP5eKdvzHcwy_lf8lpL9wAoHoom-koo5GKcbrcuX0=@pm.me>

On Sun, Oct 6, 2024 at 2:23 AM Caleb White <cdwhite3@pm.me> wrote:

Show 8 quoted lines

> On 10/6/24 01:16, Eric Sunshine <sunshine@sunshineco.com> wrote:
> >  Indeed, I'm seeing the same line-wrapping breakage in the mailing list
> >  archive and in my Inbox for v2.
> >
> >  I presume that you've verified that the raw patches are not broken
> >  like that, and that the problem is happening at email time?
>
> Yes, I've checked the patch files and they are good. I'm also not seeing any breakages in my inbox which is strange.

I've been trying to hand-edit v2 to fix the breakage in order to get it applied, but I'm not having much success. I did manage to get patch [1/4] applied, but patch [2/4] is base64-encoded for some reason (you can see it here[*]), so I haven't been able to edit it easily in order to fix the breakage. `git am` isn't particularly happy with it either; it complains:

    % git am PATCH-v2-0-4-Link-worktrees-with-relative-paths.mbox
    Applying: worktree: refactor infer_backlink() to use *strbuf
    warning: quoted CRLF detected
    Applying: worktree: link worktrees with relative paths
    .git/rebase-apply/patch:60: trailing whitespace.
    #!/bin/sh
    .git/rebase-apply/patch:61: trailing whitespace.
    .git/rebase-apply/patch:62: trailing whitespace.
    test_description='test worktrees linked with relative paths'
    .git/rebase-apply/patch:63: trailing whitespace.
    .git/rebase-apply/patch:64: trailing whitespace.
    TEST_PASSES_SANITIZE_LEAK=true
    error: patch failed: builtin/worktree.c:414
    error: builtin/worktree.c: patch does not apply
    error: patch failed: worktree.c:110
    error: worktree.c: patch does not apply
    Patch failed at 0002 worktree: link worktrees with relative paths

Can you try GitGitGadget instead (preferable) or perhaps publish this series somewhere (less preferable).

[*]: https://lore.kernel.org/git/20241006060017.171788-3-cdwhite3@pm.me/raw