From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH] t: add multi-parent test of diff-tree --stdin
Date: Wed, 22 Feb 2017 15:42:25 -0800 [thread overview]
Message-ID: <xmqqfuj5aj32.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170222233838.925157-1-sandals@crustytoothpaste.net> (brian m. carlson's message of "Wed, 22 Feb 2017 23:38:38 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> We were lacking a test that covered the multi-parent case for commits.
> Add a basic test to ensure we do not regress this behavior in the
> future.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> t/t4013-diff-various.sh | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> It's a little bit ugly to me that this test hard-codes so many values,
> and I'm concerned that it may be unnecessarily brittle. However, I
> don't have a good idea of how to perform the kind of comprehensive test
> we need otherwise.
Hmph, perhaps the expectation can be created out of the output from
'git diff-tree master^ master' or something?
>
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index d09acfe48e..e6c2a7a369 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -349,4 +349,23 @@ test_expect_success 'diff-tree --stdin with log formatting' '
> test_cmp expect actual
> '
>
> +test_expect_success 'diff-tree --stdin with two parent commits' '
> + cat >expect <<-\EOF &&
> + c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
> + :040000 040000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 f977ed46ae6873c1c30ab878e15a4accedc3618b M dir
> + :100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d f4615da674c09df322d6ba8d6b21ecfb1b1ba510 M file0
> + :000000 100644 0000000000000000000000000000000000000000 7289e35bff32727c08dda207511bec138fdb9ea5 A file3
> + 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
> + :040000 040000 847b63d013de168b2de618c5ff9720d5ab27e775 65f5c9dd60ce3b2b3324b618ac7accf8d912c113 M dir
> + :000000 100644 0000000000000000000000000000000000000000 b1e67221afe8461efd244b487afca22d46b95eb8 A file1
> + 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
> + :040000 040000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 847b63d013de168b2de618c5ff9720d5ab27e775 M dir
> + :100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d b414108e81e5091fe0974a1858b4d0d22b107f70 M file0
> + :100644 000000 01e79c32a8c99c557f0757da7cb6d65b3414466d 0000000000000000000000000000000000000000 D file2
> + EOF
> + git rev-list --parents master | git diff-tree --stdin >actual &&
> + test_cmp expect actual
> +'
> +
> +
> test_done
next prev parent reply other threads:[~2017-02-22 23:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 23:47 [PATCH v5 00/19] object_id part 6 brian m. carlson
2017-02-21 23:47 ` [PATCH v5 01/19] hex: introduce parse_oid_hex brian m. carlson
2017-02-21 23:47 ` [PATCH v5 02/19] builtin/commit: convert to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 03/19] builtin/diff-tree: " brian m. carlson
2017-02-22 18:50 ` Junio C Hamano
2017-02-22 19:16 ` Jeff King
2017-02-22 20:04 ` Junio C Hamano
2017-02-22 23:22 ` brian m. carlson
2017-02-22 23:38 ` [PATCH] t: add multi-parent test of diff-tree --stdin brian m. carlson
2017-02-22 23:42 ` Junio C Hamano [this message]
2017-02-22 23:45 ` Jeff King
2017-02-22 23:45 ` brian m. carlson
2017-02-21 23:47 ` [PATCH v5 04/19] builtin/describe: convert to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 05/19] builtin/fast-export: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 06/19] builtin/fmt-merge-message: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 07/19] builtin/grep: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 08/19] builtin/branch: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 09/19] builtin/clone: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 10/19] builtin/merge: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 11/19] Convert remaining callers of resolve_refdup to object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 12/19] builtin/replace: convert to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 13/19] reflog-walk: convert struct reflog_info " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 14/19] refs: convert each_reflog_ent_fn " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 15/19] refs: simplify parsing of reflog entries brian m. carlson
2017-02-21 23:47 ` [PATCH v5 16/19] sha1_file: introduce an nth_packed_object_oid function brian m. carlson
2017-02-21 23:47 ` [PATCH v5 17/19] Convert object iteration callbacks to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 18/19] builtin/merge-base: convert " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 19/19] wt-status: " brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfuj5aj32.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.