From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Thu, 09 Apr 2026 20:31:43 GMT
Subject: Re: [PATCH] checkout: add --autostash option for branch switching
Message-ID: <20260409203143.19012-1-haraldnordgren@gmail.com>
In-Reply-To: <xmqq7bqgujto.fsf@gitster.g>

> Two and a half things I noticed.
> 
>  * use "test_grep" to validate the result, like you did in other
>    patches to the tests.  t3903 is rather old and has uses of raw
>    "grep" but majority of the tests should already be using
>    test_grep.
> 
>  * Not validating the base line is a bit unexpected.  Even without
>    giving --base-label to the "stash apply" command, we could make
>    sure that the output says "|||||||" (and nothing else) for the
>    base label.
> 
>  * When these labels are set to an empty string, I think we should
>    refrain from adding a trailing " " after these marker characters.
>    Should we add a test case for that, e.g.
> 
>   test_must_fail git stash apply --ours-l= --theirs-l= &&
>   test_grep "^<<<<<<<$" file &&
>   test_grep "^>>>>>>>$" file

Fixed, thanks!


Harald