From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jeff Hostetler via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, git@jeffhostetler,
Junio C Hamano <gitster@pobox.com>,
Jeff Hostetler <jeffhost@microsoft.com>
Subject: Re: [PATCH 1/3] status: add status.aheadbehind setting
Date: Sat, 29 Jun 2019 19:30:01 +0200 [thread overview]
Message-ID: <20190629173001.GI21574@szeder.dev> (raw)
In-Reply-To: <2f0f2a2df9410947b985d83a924d2549d62bb65f.1560889284.git.gitgitgadget@gmail.com>
On Tue, Jun 18, 2019 at 01:21:25PM -0700, Jeff Hostetler via GitGitGadget wrote:
> diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
> index 716283b274..febf63f28a 100755
> --- a/t/t6040-tracking-info.sh
> +++ b/t/t6040-tracking-info.sh
> @@ -159,6 +159,19 @@ test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
> test_i18ncmp expect actual
> '
>
> +cat >expect <<\EOF
> +## b1...origin/master [different]
> +EOF
> +
> +test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstream)' '
> + (
> + cd test &&
> + git checkout b1 >/dev/null &&
> + git -c status.aheadbehind=false status -s -b | head -1
These tests specifically check 'git status', but the pipe hides its
exit code. Please use an intermediate file instead.
> + ) >actual &&
I found it odd to save the output of a whole subshell and redirect
'git checkout's stdout to /dev/null to prevent it from itnerfering
with the stdout of the subshell, instead of saving only the stdout of
the command the test focuses on.
> + test_i18ncmp expect actual
> +'
> +
> cat >expect <<\EOF
> On branch b1
> Your branch and 'origin/master' have diverged,
> @@ -174,6 +187,15 @@ test_expect_success 'status --long --branch' '
> test_i18ncmp expect actual
> '
>
> +test_expect_success 'status --long --branch' '
> + (
> + cd test &&
> + git checkout b1 >/dev/null &&
> + git -c status.aheadbehind=true status --long -b | head -3
> + ) >actual &&
> + test_i18ncmp expect actual
> +'
> +
> cat >expect <<\EOF
> On branch b1
> Your branch and 'origin/master' refer to different commits.
> @@ -188,6 +210,15 @@ test_expect_success 'status --long --branch --no-ahead-behind' '
> test_i18ncmp expect actual
> '
>
> +test_expect_success 'status.aheadbehind=false status --long --branch' '
> + (
> + cd test &&
> + git checkout b1 >/dev/null &&
> + git -c status.aheadbehind=false status --long -b | head -2
> + ) >actual &&
> + test_i18ncmp expect actual
> +'
> +
> cat >expect <<\EOF
> ## b5...brokenbase [gone]
> EOF
next prev parent reply other threads:[~2019-06-29 17:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 20:21 [PATCH 0/3] git-status: create config for ahead/behind calculation Derrick Stolee via GitGitGadget
2019-06-18 20:21 ` [PATCH 1/3] status: add status.aheadbehind setting Jeff Hostetler via GitGitGadget
2019-06-21 16:33 ` Junio C Hamano
2019-06-26 20:02 ` Jeff Hostetler
2019-06-29 17:30 ` SZEDER Gábor [this message]
2019-06-18 20:21 ` [PATCH 2/3] status: warn when a/b calculation takes too long Jeff Hostetler via GitGitGadget
2019-06-18 20:21 ` [PATCH 3/3] status: ignore status.aheadbehind in porcelain formats Jeff Hostetler via GitGitGadget
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=20190629173001.GI21574@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@jeffhostetler \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.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).