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

Re: [PATCH 2/8] tests: add checking that combine-diff emits only correct paths

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 3, 2014, 23:10 UTC
Message-ID
<xmqqzjm7bxny.fsf@gitster.dls.corp.google.com>
In-Reply-To
<9ee3e17af9a8da1f47423a74171d5cb95293f677.1391430523.git.kirr@mns.spb.ru>
Kirill Smelkov <kirr@mns.spb.ru> writes:
Show 9 quoted lines
> where "correct paths" stands for paths that are different to all
> parents.
>
> Up until now, we were testing combined diff only on one file, or on
> several files which were all different (t4038-diff-combined.sh).
>
> As recent thinko in "simplify intersect_paths() further" showed, and
> also, since we are going to rework code for finding paths different to
> all parents, lets write at least basic tests.
Thanks.  Some nitpicks.
Show 22 quoted lines
>
> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
> ---
>  t/t4057-diff-combined-paths.sh | 106 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 106 insertions(+)
>  create mode 100755 t/t4057-diff-combined-paths.sh
>
> diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
> new file mode 100755
> index 0000000..e6e457d
> --- /dev/null
> +++ b/t/t4057-diff-combined-paths.sh
> @@ -0,0 +1,106 @@
> +#!/bin/sh
> +
> +test_description='combined diff show only paths that are different to all parents'
> +
> +. ./test-lib.sh
> +
> +# verify that diffc.expect matches output of
> +# `git diff -c --name-only HEAD HEAD^ HEAD^2`
> +diffc_verify() {
Style: SP before (), i.e.
	diffc_verify () {
Show 6 quoted lines
> +	git diff -c --name-only HEAD HEAD^ HEAD^2 >diffc.actual &&
> +	test_cmp diffc.expect diffc.actual
> +}
> +
> +test_expect_success 'trivial merge - combine-diff empty' '
> +	for i in `test_seq 1 9`
Style: prefer $() over ``
> +	do
> +		echo $i >$i.txt	&&
> +		git add $i.txt

Quiz. What happens when this "git add" fails with an earlier value of $i?

> +	done &&
Previous: Kirill SmelkovNext: Kirill Smelkov
Message 5 of 26 in “`log -c` speedup (part 2)”
  1. 0/8 `log -c` speedup (part 2)Kirill Smelkov, Feb 3, 2014
  2. 1/8 fixup! combine_diff: simplify intersect_paths() furtherKirill Smelkov, Feb 3, 2014
  3. Junio C HamanoFeb 3, 2014
  4. 2/8 tests: add checking that combine-diff emits only correct pathsKirill Smelkov, Feb 3, 2014
  5. Junio C HamanoFeb 3, 2014
  6. Kirill SmelkovFeb 5, 2014
  7. 3/8 tree-diff: no need to manually verify that there is no mode change for a pathKirill Smelkov, Feb 3, 2014
  8. Junio C HamanoFeb 3, 2014
  9. 4/8 tree-diff: no need to pass match to skip_uninteresting()Kirill Smelkov, Feb 3, 2014
  10. 5/8 combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov, Feb 3, 2014
  11. Junio C HamanoFeb 3, 2014
  12. 6/8 combine-diff: Move changed-paths scanning logic into its own functionKirill Smelkov, Feb 3, 2014
  13. 7/8 combine-diff: Fast changed-to-all-parents paths scanningKirill Smelkov, Feb 3, 2014
  14. Junio C HamanoFeb 3, 2014
  15. Junio C HamanoFeb 3, 2014
  16. Kirill SmelkovFeb 4, 2014
  17. Junio C HamanoFeb 4, 2014
  18. Kirill SmelkovFeb 5, 2014
  19. Junio C HamanoFeb 5, 2014
  20. Kirill SmelkovFeb 5, 2014
  21. Junio C HamanoFeb 5, 2014
  22. Kirill SmelkovFeb 5, 2014
  23. Junio C HamanoFeb 5, 2014
  24. Kirill SmelkovFeb 6, 2014
  25. Junio C HamanoFeb 4, 2014
  26. 8/8 combine-diff: bail out early, if num_paths=0Kirill Smelkov, Feb 3, 2014

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.