From: Matthieu Moy Date: Tue, 26 Apr 2022 06:48:09 GMT Subject: Re: [PATCH v1 1/2] t7615: test how merge behave when there is untracked file Message-ID: <26b353a6-3c31-8f35-a282-877788c00bbf@univ-lyon1.fr> In-Reply-To: On 4/25/22 22:27, Jonathan wrote: > when there is untracked file that has the same name than file in the > merged branch git refuse to proceed, even when the file has the same > content > > t6436 test a similar thing but not especially with same content file Write your commit message like normal english: capitalize start of sentence, and period at the end (we omit the period in the subject line, though). > +test_expect_success 'fastforward fail when untracked file has the same content' ' Here and other test names: third person => s (fail_s_, and overwrite_s_ in the next patch). > + test_when_finished "git branch -D B && git reset --hard init && git clean --force" && > + git checkout -b B && > + test_commit --no-tag "tracked" file "content" && > + git checkout A && > + echo content >file && > + test_must_fail git merge B It would make sense to grep for the correct error message in the output, but maybe that's overkill. -- Matthieu Moy https://matthieu-moy.fr/