From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
To: git@vger.kernel.org
Subject: Re: [PATCH v3] for-each-ref: Always check stat_tracking_info()'s return value.
Date: Sat, 03 Jan 2015 21:19:23 +0200 [thread overview]
Message-ID: <868uhjzn7o.fsf@FreeBSD.org> (raw)
In-Reply-To: 20150103114113.GC27793@peff.net
Jeff King <peff@peff.net> writes:
> I think you could minimize this quite a bit as:
>
> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> index cba3454..f259c22 100755
> --- a/t/t6300-for-each-ref.sh
> +++ b/t/t6300-for-each-ref.sh
> @@ -340,12 +340,11 @@ cat >expected <<EOF
> EOF
>
> test_expect_success 'Check that :track[short] works when upstream is gone' '
> - git branch --track to_delete master &&
> - git branch --track parent_gone to_delete &&
> - test_when_finished "git branch -D parent_gone" &&
> - git branch -D to_delete &&
> - git for-each-ref --format="%(upstream:track)" refs/heads/parent_gone >actual &&
> - git for-each-ref --format="%(upstream:trackshort)" refs/heads/parent_gone >>actual &&
> + test_when_finished "git config branch.master.merge refs/heads/master" &&
> + git config branch.master.merge refs/heads/does-not-exist &&
> + git for-each-ref \
> + --format="%(upstream:track)$LF%(upstream:trackshort)" \
> + refs/heads/master >actual &&
> test_cmp expected actual
> '
Thanks Jeff (and Eric!) for the reviews so far. That does look much
better (the original test case was a reduction of a failure in a
Chromium test case).
One question about this suggestion: this test case actually depends on
the remote manipulations done in the setup test to work, as otherwise we
don't even test stat_tracking_info() because populate_value() would bail
out earlier on branch_get() returning NULL due to the branch's remote
not being set. Is it OK to continue assuming that?
prev parent reply other threads:[~2015-01-03 19:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-02 21:01 [PATCH v3] for-each-ref: Always check stat_tracking_info()'s return value Raphael Kubo da Costa
2015-01-03 11:41 ` Jeff King
2015-01-03 19:19 ` Raphael Kubo da Costa [this message]
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=868uhjzn7o.fsf@FreeBSD.org \
--to=rakuco@freebsd.org \
--cc=git@vger.kernel.org \
/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).