From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Mon, 02 Feb 2026 19:37:24 GMT
Subject: Re: [PATCH] stash: honor --no-overwrite-ignore when updating index
Message-ID: <CALnO6CDXwbxiQ-UjJLxgrjbgryQwxMro106BnewfFvcqchb2sw@mail.gmail.com>
In-Reply-To: <CAOLa=ZQCuka+cSuCu=KnTHm=gk1iJ_QJhDjy1Ku8WLfSgkGorw@mail.gmail.com>

On Mon, Feb 2, 2026 at 9:13 AM Karthik Nayak <karthik.188@gmail.com> wrote:
> To confirm, changing the test
>
> modified   t/t3905-stash-include-untracked.sh
> @@ -434,7 +434,7 @@ test_expect_success 'stash push
> --no-overwrite-ignore preserves ignored files' '
>         git commit -m "add ignore" &&
>
>         echo after >ignored.txt &&
> -       git stash push --no-overwrite-ignore &&
> +       git stash push --overwrite-ignore &&
>
>         test_path_is_file ignored.txt &&
>         grep after ignored.txt
>
> still passes the test. We should be testing both scenarios.

Hm. Using "git stash push" (no new flag) on my build of 2.53.0 with
only this test added passes, so I agree it seems unlikely to be
exercising the intent that led to the FIXME.

-- 
D. Ben Knoble