From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Son Luong Ngoc <son.luong@booking.com>,
git@vger.kernel.org,
Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Subject: Re: [PATCH 2/2] stash: remove the stash.useBuiltin setting
Date: Tue, 3 Mar 2020 14:33:33 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2003031430180.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200302181924.GB1571684@cat>
Hi Thomas,
On Mon, 2 Mar 2020, Thomas Gummerer wrote:
> Remove the stash.useBuiltin setting which was added as an escape hatch
> to disable the builtin version of stash first released with Git 2.22.
Great!
> diff --git a/builtin/stash.c b/builtin/stash.c
> index f371db270c..5f4bd693df 100644
> --- a/builtin/stash.c
> +++ b/builtin/stash.c
> @@ -1558,22 +1540,18 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
> OPT_END()
> };
>
> - if (!use_builtin_stash()) {
> - const char *path = mkpath("%s/git-legacy-stash",
> - git_exec_path());
> -
> - if (sane_execvp(path, (char **)argv) < 0)
> - die_errno(_("could not exec %s"), path);
> - else
> - BUG("sane_execvp() returned???");
> - }
> -
> prefix = setup_git_directory();
> trace_repo_setup(prefix);
> setup_work_tree();
However, this is only needed because we did not change `git.c` at the same
time (as I had done for `rebase` in 80dfc9242eb (git: mark cmd_rebase as
requiring a worktree, 2019-07-24)). In other words, I think we will also
want to address this part of `git.c`:
/*
* NEEDSWORK: Until the builtin stash is thoroughly robust and no
* longer needs redirection to the stash shell script this is kept as
* is, then should be changed to RUN_SETUP | NEED_WORK_TREE
*/
{ "stash", cmd_stash },
Other than that, I think your patch pair is good to go!
Ciao,
Dscho
next prev parent reply other threads:[~2020-03-03 13:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 8:33 Git Rebase: test failing with GIT_TEST_STASH_USE_BUILTIN=false Son Luong Ngoc
2020-02-25 16:57 ` Junio C Hamano
[not found] ` <710DB9BA-D134-48E7-8CAB-B8816FED8AB8@booking.com>
2020-03-01 9:59 ` [External] " Son Luong Ngoc
2020-03-01 10:40 ` Son Luong Ngoc
2020-03-02 18:18 ` [PATCH 1/2] stash: get git_stash_config at the top level Thomas Gummerer
2020-03-02 18:19 ` [PATCH 2/2] stash: remove the stash.useBuiltin setting Thomas Gummerer
2020-03-02 21:30 ` Junio C Hamano
2020-03-02 22:21 ` non-regression bug in 'git merge' (really, xdiff/xmerge, I think) Junio C Hamano
2020-03-06 15:48 ` Elijah Newren
2020-03-03 13:33 ` Johannes Schindelin [this message]
2020-03-03 16:47 ` [PATCH 2/2] stash: remove the stash.useBuiltin setting Junio C Hamano
2020-03-03 17:36 ` Thomas Gummerer
2020-03-04 16:41 ` Johannes Schindelin
[not found] ` <CA+P7+xqVyMnG6FiyL4hngPfEEMi5CKz1qN5Cy1TMMpLg3CmsBw@mail.gmail.com>
2020-03-06 14:11 ` Johannes Schindelin
2020-03-06 17:29 ` Thomas Gummerer
2020-03-03 17:46 ` [PATCH v2 1/2] stash: get git_stash_config at the top level Thomas Gummerer
2020-03-03 17:46 ` [PATCH v2 2/2] stash: remove the stash.useBuiltin setting Thomas Gummerer
2020-03-03 18:45 ` Junio C Hamano
2020-03-04 11:49 ` Thomas Gummerer
2020-03-04 16:25 ` Junio C Hamano
2020-03-05 17:04 ` Thomas Gummerer
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=nycvar.QRO.7.76.6.2003031430180.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=son.luong@booking.com \
--cc=t.gummerer@gmail.com \
--cc=ungureanupaulsebastian@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).