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

Re: [PATCH v4 3/8] t5520: test for failure if index has unresolved entries

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 18, 2015, 15:13 UTC
Message-ID
<d3f29ef8736ae4c077b754ec6e410308@www.dscho.org>
In-Reply-To
<1431955978-17890-4-git-send-email-pyokagan@gmail.com>
Hi Paul,
On 2015-05-18 15:32, Paul Tan wrote:
Show 12 quoted lines
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index 4a2c0a1..3bc0594 100755
> --- a/t/t5520-pull.sh
> +++ b/t/t5520-pull.sh
> @@ -164,6 +164,26 @@ test_expect_success 'fail if upstream branch does
> not exist' '
>  	test "$(cat file)" = file
>  '
>  
> +test_expect_success 'fail if the index has unresolved entries' '
> +	git checkout -b third second^ &&
> +	test_when_finished "git checkout -f copy && git branch -D third" &&
If you agree with my argument in 2/8, it would be nice to drop this line, too.
> +	test "$(cat file)" = file &&
> +	echo modified2 >file &&
> +	git commit -a -m modified2 &&
These two lines could be combined into "test_commit modified2 file".

Ciao, Dscho

Previous: Paul TanNext: Paul Tan
Message 12 of 24 in “Improve git-pull test coverage”
  1. 0/8 Improve git-pull test coveragePaul Tan, May 18, 2015
  2. 1/8 t5520: prevent field splitting in content comparisonsPaul Tan, May 18, 2015
  3. Junio C HamanoMay 18, 2015
  4. 2/8 t5520: test no merge candidates casesPaul Tan, May 18, 2015
  5. Johannes SchindelinMay 18, 2015
  6. Junio C HamanoMay 18, 2015
  7. debugging git tests, was: Re: [PATCH v4 2/8] t5520: test no merge candidates casesJeff King, May 18, 2015
  8. Junio C HamanoMay 18, 2015
  9. Johannes SchindelinMay 19, 2015
  10. Jeff KingJun 5, 2015
  11. 3/8 t5520: test for failure if index has unresolved entriesPaul Tan, May 18, 2015
  12. Johannes SchindelinMay 18, 2015
  13. Paul TanMay 21, 2015
  14. 4/8 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 18, 2015
  15. Johannes SchindelinMay 18, 2015
  16. 5/8 t5520: test --rebase with multiple branchesPaul Tan, May 18, 2015
  17. 6/8 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 18, 2015
  18. Stefan BellerMay 18, 2015
  19. Paul TanMay 21, 2015
  20. 7/8 t5521: test --dry-run does not make any changesPaul Tan, May 18, 2015
  21. 8/8 t5520: check reflog action in fast-forward mergePaul Tan, May 18, 2015
  22. Johannes SchindelinMay 18, 2015
  23. Paul TanMay 21, 2015
  24. Junio C HamanoMay 21, 2015

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.