From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Joel Teichroeb <joel@teichroeb.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Thomas Gummerer <t.gummerer@gmail.com>,
Christian Couder <christian.couder@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 1/6] stash: Add tests for passing in too many refs
Date: Mon, 26 Mar 2018 21:21:33 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1803262110000.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz> (raw)
In-Reply-To: <20180326011426.19159-2-joel@teichroeb.net>
Hi Joel,
On Sun, 25 Mar 2018, Joel Teichroeb wrote:
> Signed-off-by: Joel Teichroeb <joel@teichroeb.net>
I could imagine that the commit message would benefit from this body:
In preparation for converting the stash command incrementally to
a builtin command, this patch improves test coverage of the option
parsing.
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index aefde7b172..7146e27bb5 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -45,6 +45,12 @@ test_expect_success 'applying bogus stash does nothing' '
> test_cmp expect file
> '
>
> +test_expect_success 'applying with too many agruments does nothing' '
> + test_must_fail git stash apply stash@{0} bar &&
> + echo 1 >expect &&
> + test_cmp expect file
> +'
I suppose you encountered a problem where `stash apply a b` would modify
the file?
And if you really want to verify that the command does nothing, I guess
you will have to use
test-chmtime =123456789 file &&
test_must_fail git stash apply stash@{0} bar &&
test 123456789 = $(test-chmtime -v +0 file | sed 's/[^0-9].*$//')
> @@ -97,6 +103,10 @@ test_expect_success 'stash drop complains of extra options' '
> test_must_fail git stash drop --foo
> '
>
> +test_expect_success 'stash drop complains with too many refs' '
> + test_must_fail git stash drop stash@{1} stash@{2}
I wonder whether you might want to verify that the error message is
printed, e.g. via
test_must_fail git stash drop stash@{1} stash@{2} 2>err &&
test_i18ngrep "Too many" err
Also, since the added tests look very similar, it might make sense to use
a loop (with fixed revision arguments).
Ciao,
Dscho
next prev parent reply other threads:[~2018-03-26 19:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 1:14 [PATCH v2 0/6] Convert some stash functionality to a builtin Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 1/6] stash: Add tests for passing in too many refs Joel Teichroeb
2018-03-26 19:21 ` Johannes Schindelin [this message]
2018-03-26 1:14 ` [PATCH v2 2/6] stash: Add test for branch with no arguments Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 3/6] stash: convert apply to builtin Joel Teichroeb
2018-03-26 7:05 ` Christian Couder
2018-03-28 3:32 ` Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 4/6] stash: convert drop and clear " Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 5/6] stash: convert branch " Joel Teichroeb
2018-03-26 1:14 ` [PATCH v2 6/6] stash: convert pop " Joel Teichroeb
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1803262110000.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz \
--to=johannes.schindelin@gmx.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=joel@teichroeb.net \
--cc=sunshine@sunshineco.com \
--cc=t.gummerer@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).