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

Re: [PATCH v5 3/9] tests: new test for orderfile options

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 24, 2014, 18:45 UTC
Message-ID
<xmqqoazqva5s.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1398331809-11309-3-git-send-email-mst@redhat.com>
"Michael S. Tsirkin" <mst@redhat.com> writes:
Show 13 quoted lines
> The test is very basic and can be extended.
> Couldn't find a good existing place to put it,
> so created a new file.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  t/t4056-diff-order.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 63 insertions(+)
>  create mode 100755 t/t4056-diff-order.sh
>
> diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
> new file mode 100755
> index 0000000..0404f50
Huh?  What codebase is this based on?

I think we had t4056 since b5277730 (t4056: add new tests for "git diff -O", 2013-12-18).

Puzzled...
Show 66 quoted lines
> --- /dev/null
> +++ b/t/t4056-diff-order.sh
> @@ -0,0 +1,63 @@
> +#!/bin/sh
> +
> +test_description='diff orderfile'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'setup' '
> +	as="a a a a a a a a" && # eight a
> +	test_write_lines $as >foo &&
> +	test_write_lines $as >bar &&
> +	git add foo bar &&
> +	git commit -a -m initial &&
> +	test_write_lines $as b >foo &&
> +	test_write_lines $as b >bar &&
> +	git commit -a -m first &&
> +	test_write_lines bar foo >bar-then-foo &&
> +	test_write_lines foo bar >foo-then-bar &&
> +	git diff -Ofoo-then-bar HEAD~1..HEAD >diff-foo-then-bar &&
> +	git diff -Obar-then-foo HEAD~1..HEAD >diff-bar-then-foo
> +'
> +
> +test_diff_well_formed () {
> +	grep ^+b "$1" >added
> +	grep ^-b "$1" >removed
> +	grep ^+++ "$1" >oldfiles
> +	grep ^--- "$1" >newfiles
> +	test_line_count = 2 added &&
> +	test_line_count = 0 removed &&
> +	test_line_count = 2 oldfiles &&
> +	test_line_count = 2 newfiles
> +}
> +
> +test_expect_success 'diff output with -O is well-formed' '
> +	test_diff_well_formed diff-foo-then-bar &&
> +	test_diff_well_formed diff-bar-then-foo
> +'
> +
> +test_expect_success 'flag -O affects diff output' '
> +	! test_cmp diff-foo-then-bar diff-bar-then-foo
> +'
> +
> +test_expect_success 'orderfile is same as -O' '
> +	test_config diff.orderfile foo-then-bar &&
> +	git diff HEAD~1..HEAD >diff-foo-then-bar-config &&
> +	test_config diff.orderfile bar-then-foo &&
> +	git diff HEAD~1..HEAD >diff-bar-then-foo-config &&
> +	test_cmp diff-foo-then-bar diff-foo-then-bar-config &&
> +	test_cmp diff-bar-then-foo diff-bar-then-foo-config
> +'
> +
> +test_expect_success '-O overrides orderfile' '
> +	test_config diff.orderfile foo-then-bar &&
> +	git diff -Obar-then-foo HEAD~1..HEAD >diff-bar-then-foo-flag &&
> +	test_cmp diff-bar-then-foo diff-bar-then-foo-flag
> +'
> +
> +test_expect_success '/dev/null is same as no orderfile' '
> +	git diff -O/dev/null HEAD~1..HEAD>diff-null-orderfile &&
> +	git diff HEAD~1..HEAD >diff-default &&
> +	test_cmp diff-null-orderfile diff-default
> +'
> +
> +test_done
Previous: Jonathan NiederNext: Michael S. Tsirkin
Message 7 of 21 in “diff: add a config option to control orderfile”
  1. 1/9 diff: add a config option to control orderfileMichael S. Tsirkin, Apr 24, 2014
  2. 2/9 test: add test_write_lines helperMichael S. Tsirkin, Apr 24, 2014
  3. Jonathan NiederApr 24, 2014
  4. Junio C HamanoApr 24, 2014
  5. 3/9 tests: new test for orderfile optionsMichael S. Tsirkin, Apr 24, 2014
  6. Jonathan NiederApr 24, 2014
  7. Junio C HamanoApr 24, 2014
  8. Michael S. TsirkinApr 24, 2014
  9. 4/9 patch-id: make it stable against hunk reorderingMichael S. Tsirkin, Apr 24, 2014
  10. Jonathan NiederApr 24, 2014
  11. Junio C HamanoApr 24, 2014
  12. Michael S. TsirkinApr 24, 2014
  13. 5/9 patch-id: document new behaviourMichael S. Tsirkin, Apr 24, 2014
  14. Jonathan NiederApr 24, 2014
  15. Michael S. TsirkinApr 24, 2014
  16. Junio C HamanoApr 24, 2014
  17. Michael S. TsirkinApr 27, 2014
  18. 6/9 patch-id-test: test stable and unstable behaviourMichael S. Tsirkin, Apr 24, 2014
  19. 7/9 patch-id: change default to stableMichael S. Tsirkin, Apr 24, 2014
  20. 8/9 t4204-patch-id.sh: default is now stableMichael S. Tsirkin, Apr 24, 2014
  21. 9/9 Documentation/git-patch-id.txt: default is stableMichael S. Tsirkin, Apr 24, 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.