From: Alban Gruin <alban.gruin@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Stefan Beller <sbeller@google.com>,
Christian Couder <christian.couder@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [GSoC][PATCH 1/1] rebase--interactive: rewrite the edit-todo functionality in C
Date: Tue, 12 Jun 2018 18:11:45 +0200 [thread overview]
Message-ID: <599bb1fd-3a09-8c2d-d319-dbed95012895@gmail.com> (raw)
In-Reply-To: <CABPp-BHG41ePN1jRxADfb47FnXfKgJ++Jv=DUiTPwpUJUi=C=w@mail.gmail.com>
Hi Elijah,
Le 12/06/2018 à 17:46, Elijah Newren a écrit :
> Hi Alban,
>
> On Mon, Jun 11, 2018 at 6:57 AM, Alban Gruin <alban.gruin@gmail.com> wrote:
>> This rewrites the edit-todo functionality from shell to C.
>>
>> To achieve that, a new command mode, `edit-todo`, is added, and the
>> `write-edit-todo` flag is removed, as the shell script does not need to
>> write the edit todo help message to the todo list anymore.
>>
>> The shell version is then stripped in favour of a call to the helper.
>
> I looked over the patch and didn't see any problems (though I haven't
> worked with rebase--helper before, or the code for todo list editing),
> but when I went to apply the patch it failed telling me:
>
> Applying: rebase--interactive: rewrite the edit-todo functionality in C
> error: sha1 information is lacking or useless (builtin/rebase--helper.c).
> error: could not build fake ancestor
> Patch failed at 0001 rebase--interactive: rewrite the edit-todo
> functionality in C
> Use 'git am --show-current-patch' to see the failed patch
>
> I tried each of master, next, and pu (as of today) to see if it might
> apply there. On which commit is this patch based? (Do you have other
> local commits that this was based on top of?)
>
>
> Elijah
>
It can be applied on top of pu with my patch that rewrites
append_todo_help() in C
(https://public-inbox.org/git/20180607103012.22981-1-alban.gruin@gmail.com/)
Cheers,
Alban
next prev parent reply other threads:[~2018-06-12 16:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-11 13:57 [GSoC][PATCH 0/1] rebase -i: rewrite the edit-todo functionality in C Alban Gruin
2018-06-11 13:57 ` [GSoC][PATCH 1/1] rebase--interactive: " Alban Gruin
2018-06-11 15:32 ` Phillip Wood
2018-06-12 12:33 ` Alban Gruin
2018-06-12 16:20 ` Phillip Wood
2018-06-12 15:46 ` Elijah Newren
2018-06-12 16:11 ` Alban Gruin [this message]
2018-06-13 15:22 ` [GSoC][PATCH v2 0/2] rebase -i: " Alban Gruin
2018-06-13 15:22 ` [GSoC][PATCH v2 1/2] editor: add a function to launch the sequence editor Alban Gruin
2018-06-13 15:22 ` [GSoC][PATCH v2 2/2] rebase--interactive: rewrite the edit-todo functionality in C Alban Gruin
2018-06-14 20:14 ` Junio C Hamano
2018-06-14 20:24 ` Alban Gruin
2018-06-14 20:42 ` Elijah Newren
2018-06-14 9:53 ` [GSoC][PATCH v2 0/2] rebase -i: " Phillip Wood
2018-06-26 16:21 ` [GSoC][PATCH v3 " Alban Gruin
2018-06-26 16:21 ` [GSoC][PATCH v3 1/2] editor: add a function to launch the sequence editor Alban Gruin
2018-06-26 16:21 ` [GSoC][PATCH v3 2/2] rebase-interactive: rewrite the edit-todo functionality in C Alban Gruin
2018-06-26 21:47 ` Johannes Schindelin
2018-06-26 21:45 ` [GSoC][PATCH v3 0/2] rebase -i: " 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
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=599bb1fd-3a09-8c2d-d319-dbed95012895@gmail.com \
--to=alban.gruin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sbeller@google.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.
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).