From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Thomas Gummerer <t.gummerer@gmail.com>,
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: Fri, 6 Mar 2020 15:11:14 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2003061509530.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CA+P7+xqVyMnG6FiyL4hngPfEEMi5CKz1qN5Cy1TMMpLg3CmsBw@mail.gmail.com>
Hi Jacob,
On Thu, 5 Mar 2020, Jacob Keller wrote:
> Sorry this is on phone and might not hit the list since Gmail forces
> html.... but the docs say git-rebase when you meant git-stash.
>
> I didn't want to forget this before I got to a desktop
Good point. You mean this part, right?
> On Mon, Mar 2, 2020, 10:20 AM Thomas Gummerer <t.gummerer@gmail.com> wrote:
>
> > diff --git a/Documentation/config/stash.txt
> > b/Documentation/config/stash.txt
> > index abc7ef4a3a..0f3db821f6 100644
> > --- a/Documentation/config/stash.txt
> > +++ b/Documentation/config/stash.txt
> > @@ -1,17 +1,9 @@
> > stash.useBuiltin::
> > - Set to `false` to use the legacy shell script implementation of
> > - linkgit:git-stash[1]. Is `true` by default, which means use
> > - the built-in rewrite of it in C.
> > -+
> > -The C rewrite is first included with Git version 2.22 (and Git for Windows
> > -version 2.19). This option serves as an escape hatch to re-enable the
> > -legacy version in case any bugs are found in the rewrite. This option and
> > -the shell script version of linkgit:git-stash[1] will be removed in some
> > -future release.
> > -+
> > -If you find some reason to set this option to `false`, other than
> > -one-off testing, you should report the behavior difference as a bug in
> > -Git (see https://git-scm.com/community for details).
> > + Unused configuration Variable. Used in Git versions 2.22 to
> > + 2.26 as an escape hatch to enable the legacy shellscript
> > + implementation of rebase. Now the built-in rewrite of it in C
^^^^^^
If so, I agree, that should be s/rebase/stash/.
Thanks for paying apparently more attention than I did!
Dscho
> > + is always used. Setting this will emit a warning, to alert any
> > + remaining users that setting this now does nothing.
> >
> > stash.showPatch::
> > If this is set to true, the `git stash show` command without an
next prev parent reply other threads:[~2020-03-06 14:11 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 ` [PATCH 2/2] stash: remove the stash.useBuiltin setting Johannes Schindelin
2020-03-03 16:47 ` 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 [this message]
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.2003061509530.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.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).