From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Denton Liu <liu.denton@gmail.com>
Subject: Re: What's cooking in git.git (Apr 2019, #02; Wed, 10)
Date: Wed, 10 Apr 2019 11:12:36 +0100 [thread overview]
Message-ID: <2a91a971-24fa-9cc7-5159-14c0771838f6@gmail.com> (raw)
In-Reply-To: <xmqqr2ab2gs6.fsf@gitster-ct.c.googlers.com>
On 09/04/2019 19:08, Junio C Hamano wrote:
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'. The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
>
> * pw/rebase-i-internal-rfc (2019-03-21) 12 commits
> - rebase -i: run without forking rebase--interactive
> - rebase: use a common action enum
> - rebase -i: use struct rebase_options in do_interactive_rebase()
> - rebase -i: use struct rebase_options to parse args
> - rebase -i: use struct object_id for squash_onto
> - rebase -i: use struct commit when parsing options
> - rebase -i: remove duplication
> - rebase -i: combine rebase--interactive.c with rebase.c
> - rebase: use OPT_RERERE_AUTOUPDATE()
> - rebase: rename write_basic_state()
> - sequencer: always discard index after checkout
> - Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal-rfc
> (this branch uses ag/sequencer-reduce-rewriting-todo.)
>
> The internal implementation of "git rebase -i" has been updated to
> avoid forking a separate "rebase--interactive" process.
>
> Comments? Is this ready?
It is more or less ready, there weren't many comments. I'm planning to
send a re-roll but am waiting to see what happens with
dl/merge-cleanup-scissors-fix and [1] (which you don't seem to have
picked up yet) as we discussed rebasing this series on top of a merge of
the current base with dl/merge-cleanup-scissors-fix which currently
conflicts with [1].
Also now ab/drop-scripted-rebase is going to be in master I could add a
patch to this series that drops a bunch of unneeded options from
rebase--interactive as it will only be called by
git-rebase--preserve-merges.sh which only uses a subset of the current
options but that could always come separately later.
Best Wishes
Phillip
[1]
https://public-inbox.org/git/20190329110842.30604-1-phillip.wood123@gmail.com/
next prev parent reply other threads:[~2019-04-10 10:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 18:08 What's cooking in git.git (Apr 2019, #02; Wed, 10) Junio C Hamano
2019-04-09 18:22 ` Denton Liu
2019-04-10 3:09 ` Junio C Hamano
2019-04-09 19:18 ` Thomas Gummerer
2019-04-10 3:01 ` Junio C Hamano
2019-04-10 20:45 ` Thomas Gummerer
2019-04-10 22:13 ` Johannes Schindelin
2019-04-10 0:46 ` Todd Zullinger
2019-04-10 10:12 ` Phillip Wood [this message]
2019-04-10 22:15 ` Johannes Schindelin
2019-04-10 18:29 ` Mazo, Andrey
2019-04-10 21:51 ` nd/switch-and-restore, was " Johannes Schindelin
2019-04-10 21:56 ` dl/warn-tagging-a-tag, " Johannes Schindelin
2019-04-12 1:51 ` Junio C Hamano
2019-04-10 22:32 ` jh/trace2-sid-fix, " Johannes Schindelin
2019-04-11 15:06 ` Christian Couder
2019-04-14 3:55 ` Junio C Hamano
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=2a91a971-24fa-9cc7-5159-14c0771838f6@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).