From: Thomas Gummerer <t.gummerer@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jacob Keller <jacob.keller@gmail.com>
Subject: Re: What's cooking in git.git (Mar 2020, #02; Thu, 5)
Date: Tue, 10 Mar 2020 16:13:01 +0000 [thread overview]
Message-ID: <20200310161301.GA157628@cat> (raw)
In-Reply-To: <xmqqv9nh2wu9.fsf@gitster-ct.c.googlers.com>
On 03/06, Junio C Hamano wrote:
> Thomas Gummerer <t.gummerer@gmail.com> writes:
>
> > On 03/05, Junio C Hamano wrote:
> >> * tg/retire-scripted-stash (2020-03-05) 2 commits
> >> (merged to 'next' on 2020-03-05 at 8e82eb9dec)
> >> + stash: remove the stash.useBuiltin setting
> >> + stash: get git_stash_config at the top level
> >>
> >> "git stash" has kept an escape hatch to use the scripted version
> >> for a few releases, which got stale. It has been removed.
> >>
> >> Will merge to 'master'.
> >
> > I was thinking only getting this into a release after 2.26 dropped,
> > and have written the docs with that in mind. Not sure if this "Will
> > merge to 'master'" means that you were planning to get this into 2.26?
>
> Committed to merge to 'master' sometime in the future, but it still
> is not known if it will be before or after the upcoming release.
>
> > I have a slight preference for waiting until after the release to
> > merge this down, but I'm okay with doing it now.
>
> Being cautious is good. I do not think this is ultra-urgent; as you
> said in <20200303174613.3557960-2-t.gummerer@gmail.com>, the "bug"
> has been with us for a couple of releases already. I do not mind
> keeping it in 'next' and merge as a part of the first batch after
> the release.
I would prefer that, thanks!
> > If we want to do so
> > we need to tweak the description in 'Documentation/config/stash.txt'
> > to refer to 2.25 instead of 2.26.
> >
> > Either way, we'll need the patch below on top, as I made an
> > embarrassing copy-paste mistake. Sorry for the trouble.
>
> Heh, I think 8a2cd3f5 ("stash: remove the stash.useBuiltin setting",
> 2020-03-03) that is on 'next' already has it (and s/Variable/variable/
> casefix).
Ah great, thanks for catching this already. One less embarrassing
mistake of mine in Gits history :)
prev parent reply other threads:[~2020-03-10 16:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 22:02 What's cooking in git.git (Mar 2020, #02; Thu, 5) Junio C Hamano
2020-03-05 22:08 ` Taylor Blau
2020-03-06 17:29 ` Thomas Gummerer
2020-03-06 17:54 ` Junio C Hamano
2020-03-10 16:13 ` Thomas Gummerer [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=20200310161301.GA157628@cat \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.