From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Kacper Kornet <draenog@pld-linux.org>,
git@vger.kernel.org, Martin von Zweigbergk <martinvonz@gmail.com>
Subject: Re: [PATCH 3/3] t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
Date: Sun, 25 Aug 2013 00:09:11 -0700 [thread overview]
Message-ID: <20130825070911.GU2882@elie.Belkin> (raw)
In-Reply-To: <xmqq8uzql0vr.fsf@gitster.dls.corp.google.com>
Junio C Hamano wrote:
> The change to the one that feeds 'y' to "reset -p" may be a bit too
> pedantic, as we are not in the business of testing "echo y", though.
Yeah, that's true. Here's a patch for squashing in.
diff --git i/t/t7106-reset-unborn-branch.sh w/t/t7106-reset-unborn-branch.sh
index af00ab4d..bd28feba 100755
--- i/t/t7106-reset-unborn-branch.sh
+++ w/t/t7106-reset-unborn-branch.sh
@@ -12,9 +12,8 @@ test_expect_success 'reset' '
git add a b &&
git reset &&
- >expect &&
git ls-files >actual &&
- test_cmp expect actual
+ test_must_be_empty actual
'
test_expect_success 'reset HEAD' '
@@ -36,12 +35,10 @@ test_expect_success 'reset $file' '
test_expect_success PERL 'reset -p' '
rm .git/index &&
git add a &&
- echo y >yes &&
- git reset -p <yes &&
+ echo y | git reset -p &&
- >expect &&
git ls-files >actual &&
- test_cmp expect actual
+ test_must_be_empty actual
'
test_expect_success 'reset --soft is a no-op' '
@@ -60,9 +57,8 @@ test_expect_success 'reset --hard' '
test_when_finished "echo a >a" &&
git reset --hard &&
- >expect &&
git ls-files >actual &&
- test_cmp expect actual &&
+ test_must_be_empty actual &&
test_path_is_missing a
'
next prev parent reply other threads:[~2013-08-25 7:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-24 4:01 [PATCH 0/3] Fixes for tests run without perl Kacper Kornet
2013-08-24 4:01 ` [PATCH 1/3] Make test "using invalid commit with -C" more strict Kacper Kornet
2013-08-24 20:01 ` Jonathan Nieder
2013-08-25 6:38 ` Junio C Hamano
2013-08-25 6:40 ` Jonathan Nieder
2013-08-24 4:01 ` [PATCH 2/3] t/t3701-add-interactive.sh: Add PERL prerequisite Kacper Kornet
2013-08-24 20:13 ` Jonathan Nieder
2013-08-24 4:01 ` [PATCH 3/3] t/t7106-reset-unborn-branch.sh: " Kacper Kornet
2013-08-24 20:34 ` Jonathan Nieder
2013-08-25 6:50 ` Junio C Hamano
2013-08-25 7:09 ` Jonathan Nieder [this message]
2013-08-24 19:58 ` [PATCH 0/3] Fixes for tests run without perl Jonathan Nieder
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=20130825070911.GU2882@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=draenog@pld-linux.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martinvonz@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.
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 NNTP newsgroup(s).