git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] t1404: mark directory/file conflict tests with REFFILES

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 26, 2021, 07:39 UTC
Message-ID
<xmqq35nj8ix6.fsf@gitster.g>
In-Reply-To
<pull.1148.git.git.1637855828856.gitgitgadget@gmail.com>
"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes:
> -test_expect_success 'D/F conflict prevents add long + delete short' '
> +test_expect_success REFFILES  'D/F conflict prevents add long + delete short' '
Two spaces after REFFILES here but ...
Show 5 quoted lines
>  	df_test refs/df-al-ds --add-del foo/bar foo
>  '
>  
> -test_expect_success 'D/F conflict prevents add short + delete long' '
> +test_expect_success REFFILES 'D/F conflict prevents add short + delete long' '
... only one space here and then ...
Show 5 quoted lines
>  	df_test refs/df-as-dl --add-del foo foo/bar
>  '
>  
> -test_expect_success 'D/F conflict prevents delete long + add short' '
> +test_expect_success REFFILES  'D/F conflict prevents delete long + add short' '
... two spaces here?  Let's be consistent.
>  	df_test refs/df-dl-as --del-add foo/bar foo
>  '

As all these df_test instances _expect_ to fail, not causing any changes in the refs, I think skipping them would hopefully not reveal unpleasant reliance of side effects by later tests.

And presumably, without REFFILES prerequisite, these operations would be supported? E.g. we can have 'main' branch, with 'main/1', 'main/2',... refs, at the same time, with reftable? That would be quite interesting.

Previous: Han-Wen Nienhuys via GitGitGadgetNext: Han-Wen Nienhuys
Message 2 of 5 in “t1404: mark directory/file conflict tests with REFFILES”
  1. t1404: mark directory/file conflict tests with REFFILESHan-Wen Nienhuys via GitGitGadget, Nov 25, 2021
  2. Junio C HamanoNov 26, 2021
  3. Han-Wen NienhuysNov 29, 2021
  4. Junio C HamanoNov 29, 2021
  5. t1404: mark directory/file conflict tests with REFFILESHan-Wen Nienhuys via GitGitGadget, Nov 29, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.