From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <chriscool@tuxfamily•org>
Cc: git@vger•kernel.org, Jeff King <peff@peff•net>,
Michael Haggerty <mhagger@alum•mit.edu>,
Jakub Narebski <jnareb@gmail•com>,
Eric Sunshine <sunshine@sunshineco•com>
Subject: Re: [PATCH v5 2/7] replace: add test for --graft
Date: Wed, 02 Jul 2014 13:49:26 -0700 [thread overview]
Message-ID: <xmqqy4wbfpux.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140628181117.5687.23923.chriscool@tuxfamily.org> (Christian Couder's message of "Sat, 28 Jun 2014 20:11:11 +0200")
Christian Couder <chriscool@tuxfamily•org> writes:
> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
> Signed-off-by: Junio C Hamano <gitster@pobox•com>
> ---
> t/t6050-replace.sh | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
> index 68b3cb2..ca45a84 100755
> --- a/t/t6050-replace.sh
> +++ b/t/t6050-replace.sh
> @@ -351,4 +351,16 @@ test_expect_success 'replace ref cleanup' '
> test -z "$(git replace)"
> '
>
> +test_expect_success '--graft with and without already replaced object' '
> + test $(git log --oneline | wc -l) = 7 &&
> + git replace --graft $HASH5 &&
> + test $(git log --oneline | wc -l) = 3 &&
> + git cat-file -p $HASH5 | test_must_fail grep parent &&
Please do not run non-git command under test_must_fail.
> + test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
> + git replace --force -g $HASH5 $HASH4 $HASH3 &&
> + git cat-file -p $HASH5 | grep "parent $HASH4" &&
> + git cat-file -p $HASH5 | grep "parent $HASH3" &&
> + git replace -d $HASH5
> +'
> +
> test_done
For all these "git cat-file -p $commit | grep ...", I would think
you should add "commit_has_parents" helper function to allow a bit
more careful testing. As written, the test will mistake a commit
with string "parent $HASHx" anywhere, not in the header part, and
the test does not ensure that $HASH{3,4} is the {first,second}
parent.
commit_has_parents $HASH5 $HASH4 $HASH3
would then may be implemented like:
commit_has_parents () {
git cat-file commit "$1" >payload &&
sed -n -e '/^$/q' -e 's/^parent //p' <payload >actual &&
shift &&
printf 'parent %s\n' "$@" >expect &&
test_cmp expect actual
}
next prev parent reply other threads:[~2014-07-02 20:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 18:11 [PATCH v5 0/7] Add --graft option to git replace Christian Couder
2014-06-28 18:11 ` [PATCH v5 1/7] replace: add --graft option Christian Couder
2014-06-28 18:11 ` [PATCH v5 2/7] replace: add test for --graft Christian Couder
2014-07-02 20:49 ` Junio C Hamano [this message]
2014-07-03 13:39 ` Christian Couder
2014-07-03 18:45 ` Junio C Hamano
2014-06-28 18:11 ` [PATCH v5 3/7] Documentation: replace: add --graft option Christian Couder
2014-06-28 18:11 ` [PATCH v5 4/7] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-06-28 18:11 ` [PATCH v5 5/7] replace: refactor replacing parents Christian Couder
2014-07-02 21:05 ` Junio C Hamano
2014-07-03 13:42 ` Christian Couder
2014-06-28 18:11 ` [PATCH v5 6/7] replace: remove signature when using --graft Christian Couder
2014-07-02 21:19 ` Junio C Hamano
2014-07-03 14:09 ` Christian Couder
2014-06-28 18:11 ` [PATCH v5 7/7] replace: add test for --graft with signed commit Christian Couder
2014-07-02 21:22 ` Junio C Hamano
2014-07-03 14:17 ` Christian Couder
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=xmqqy4wbfpux.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox