From: Liam Beguin <liambeguin@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Philip Oakley <philipoakley@iee.org>, Jeff King <peff@peff.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper
Date: Sat, 17 Jun 2017 18:48:47 -0400 [thread overview]
Message-ID: <529f6cc7-ab2b-72bb-bc51-f4cca4e98652@gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.21.1.1706161551030.4200@virtualbox>
Hi Johannes,
On 16/06/17 09:56 AM, Johannes Schindelin wrote:
> Hi Liam,
>
> On Thu, 15 Jun 2017, Liam Beguin wrote:
>
>> On 14/06/17 09:08 AM, Johannes Schindelin wrote:
>>> diff --git a/sequencer.c b/sequencer.c
>>> index a697906d463..a0e020dab09 100644
>>> --- a/sequencer.c
>>> +++ b/sequencer.c
>>> @@ -2640,3 +2640,110 @@ int check_todo_list(void)
>>>
>>> return res;
>>> }
>>> +
>>> +/* skip picking commits whose parents are unchanged */
>>> +int skip_unnecessary_picks(void)
>>> +{
>>> + const char *todo_file = rebase_path_todo();
>>> + struct strbuf buf = STRBUF_INIT;
>>> + struct todo_list todo_list = TODO_LIST_INIT;
>>> + struct object_id onto_oid, *oid = &onto_oid, *parent_oid;
>>> + int fd, i;
>>> +
>>> + if (!read_oneliner(&buf, rebase_path_onto(), 0))
>>> + return error(_("could not read 'onto'"));
>>> + if (get_sha1(buf.buf, onto_oid.hash)) {
>>
>> I missed this last time but we could also replace `get_sha1` with `get_oid`
>
> Good point!
>
> I replaced this locally and force-pushed, but there is actually little
> chance of this patch series being integrated in a form with which I would
> be comfortable.
Is there any chance of this moving forward? I was hoping to resend my path to
abbreviate command names on top of this.
>
> Ciao,
> Dscho
>
Thanks,
- Liam
next prev parent reply other threads:[~2017-06-17 22:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 13:06 [PATCH v5 00/10] The final building block for a faster rebase -i Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 01/10] t3415: verify that an empty instructionFormat is handled as before Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 02/10] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 03/10] rebase -i: remove useless indentation Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 04/10] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 05/10] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 06/10] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-06-14 13:07 ` [PATCH v5 07/10] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-06-14 13:08 ` [PATCH v5 08/10] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-06-16 2:39 ` Liam Beguin
2017-06-16 13:56 ` Johannes Schindelin
2017-06-17 22:48 ` Liam Beguin [this message]
2017-06-19 9:45 ` Johannes Schindelin
2017-06-19 16:10 ` Jeff King
2017-06-19 17:39 ` Junio C Hamano
2017-06-20 2:35 ` Liam Beguin
2017-06-14 13:08 ` [PATCH v5 09/10] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-06-14 13:08 ` [PATCH v5 10/10] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-06-15 23:13 ` [PATCH v5 00/10] The final building block for a faster rebase -i Junio C Hamano
2017-06-16 13:50 ` Johannes Schindelin
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=529f6cc7-ab2b-72bb-bc51-f4cca4e98652@gmail.com \
--to=liambeguin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--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.
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).