From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 19 Sep 2021 13:44:55 GMT
Subject: Re: [PATCH 1/6] t2500: add various tests for nuking untracked files
Message-ID: <871r5kd6dg.fsf@evledraar.gmail.com>
In-Reply-To: <b634136a74b37a6f73bc3038f79031e040423883.1632006923.git.gitgitgadget@gmail.com>


On Sat, Sep 18 2021, Elijah Newren via GitGitGadget wrote:

> +	test_create_repo reset_$1 &&

s/test_create_repo/git init/ these days (also for the rest).

> +		mkdir foo.t &&
> +		echo precious >foo.t/file &&
> +		cp foo.t/file expect &&
> +
> +		test_must_fail git reset --merge work 2>error &&
> +		test_cmp expect foo.t/file &&
> +		grep "Updating.*foo.t.*would lose untracked files" error

The test is ambiguous about whether we complain about foo.t/file, or
foo.t, if there was foo.t{file,file-two} would we complain just once or
twice?

I think it's just the directory, but probably worthwhile for the test to
make the distinction. If it's a "a/sub/dir/file" do we complain about
"a/" or "a/sub/dir/" ?