From: Taylor Blau Date: Sat, 12 Sep 2020 03:49:01 GMT Subject: Re: [PATCH 0/8] various wt-status/worktree cleanups Message-ID: <20200912034901.GA4101@nand.local> In-Reply-To: On Thu, Sep 10, 2020 at 09:03:34PM +0200, Martin Ă…gren wrote: > This merges pretty well with `seen` (`jc/quote-path-cleanup`) (and the > tests still pass). These patches are obviously low priority, nothing > revolutionary here. What revision is this series based on, again? Applying the first patch on top of 'seen' (bf3e2864f3, at the time of writing) produces a conflict due to the dropped parameter in 'dwim_ref()'. But, applying in directly on top of Junio's 'jc/quote-path-cleanup' from his repository handles the first patch just fine, but fails in the second patch. The conflicts here are in 'wt_shortstatus_unmerged' and 'wt_shortstatus_status'. I didn't look deeply to figure out what exactly was going on here, but it would be good to know so that I can play with these patches a bit myself. Thanks, Taylor