On Tue, Jun 9, 2020 at 7:53 PM Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> wrote: > If you need to re-roll your 'es/worktree-duplicate-paths' branch, could you > please squash this into the relevant patch (commit 71806ee9e8 (worktree: prune > linked worktree referencing main worktree path, 2020-06-08)). Thanks, I'll apply this change when I re-roll. > Note that this is based on top of the 'pu' branch, and Junio has a fixup > patch (commit 4b01d684fe (SQUASH??? -Werror=main, 2020-06-08)) which also > changes this line of code (s/main/main_path/). Indeed, I saw Junio's SQUASH and was planning on applying that, as well.
