Re: [GSoC][PATCH 1/1] rebase--interactive: rewrite the edit-todo functionality in C

From: Elijah Newren <newren@gmail.com>
Date: Jun 12, 2018, 15:46 UTC
Message-ID: <CABPp-BHG41ePN1jRxADfb47FnXfKgJ++Jv=DUiTPwpUJUi=C=w@mail.gmail.com>
In-Reply-To: <20180611135714.29378-2-alban.gruin@gmail.com>

Hi Alban,

On Mon, Jun 11, 2018 at 6:57 AM, Alban Gruin <alban.gruin@gmail.com> wrote:

Show 7 quoted lines

> 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