From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
gitgitgadget@gmail.com, Pratik Karki <predatoramigo@gmail.com>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 2/2] tests: add a special setup where rebase.useBuiltin is off
Date: Wed, 14 Nov 2018 14:53:29 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1811141452520.39@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20181114091506.1452-3-avarab@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1915 bytes --]
Hi Ævar,
On Wed, 14 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Add a GIT_TEST_REBASE_USE_BUILTIN=false test mode which is equivalent
> to running with rebase.useBuiltin=false. This is needed to spot that
> we're not introducing any regressions in the legacy rebase version
> while we're carrying both it and the new builtin version.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> builtin/rebase.c | 5 ++++-
> t/README | 4 ++++
> 2 files changed, 8 insertions(+), 1 deletion(-)
I am slightly surprised not to see any ci/ change in this diffstat. Did
you mean to add a test axis for Travis, or not?
Ciao,
Dscho
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 0ee06aa363..68ad8c1149 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -48,7 +48,10 @@ static int use_builtin_rebase(void)
> {
> struct child_process cp = CHILD_PROCESS_INIT;
> struct strbuf out = STRBUF_INIT;
> - int ret;
> + int ret, env = git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1);
> +
> + if (env != -1)
> + return env;
>
> argv_array_pushl(&cp.args,
> "config", "--bool", "rebase.usebuiltin", NULL);
> diff --git a/t/README b/t/README
> index 242497455f..3df5d12e46 100644
> --- a/t/README
> +++ b/t/README
> @@ -339,6 +339,10 @@ for the index version specified. Can be set to any valid version
> GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
> by overriding the minimum number of cache entries required per thread.
>
> +GIT_TEST_REBASE_USE_BUILTIN=<boolean>, when false, disables the
> +builtin version of git-rebase. See 'rebase.useBuiltin' in
> +git-config(1).
> +
> GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
> of the index for the whole test suite by bypassing the default number of
> cache entries and thread minimums. Setting this to 1 will make the
> --
> 2.19.1.1182.g4ecb1133ce
>
>
next prev parent reply other threads:[~2018-11-14 13:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0181114090144.31412-1-avarab@gmail.com>
2018-11-14 9:15 ` [PATCH v2 0/2] rebase.useBuiltin doc & test mode Ævar Arnfjörð Bjarmason
2018-11-14 9:15 ` [PATCH v2 1/2] rebase doc: document rebase.useBuiltin Ævar Arnfjörð Bjarmason
2018-11-14 13:52 ` Johannes Schindelin
2018-11-16 3:40 ` Junio C Hamano
2018-11-16 9:35 ` Johannes Schindelin
2018-11-16 9:58 ` Junio C Hamano
2018-11-14 9:15 ` [PATCH v2 2/2] tests: add a special setup where rebase.useBuiltin is off Ævar Arnfjörð Bjarmason
2018-11-14 13:53 ` Johannes Schindelin [this message]
2018-11-14 13:58 ` Ævar Arnfjörð Bjarmason
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.1811141452520.39@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=predatoramigo@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).