From: Phillip Wood <phillip.wood123@gmail.com>
To: Jarno Suni <jarno.ilari.suni@gmail.com>, phillip.wood@dunelm.org.uk
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: error: could not parse 'Drop' when rebasing
Date: Wed, 26 Mar 2025 15:12:59 +0000 [thread overview]
Message-ID: <65e64dda-31e2-43fa-8269-f1bd5f3d26e7@gmail.com> (raw)
In-Reply-To: <CAOqj8L1Ammwp07ju2dweVhRVdkTv=hROaDjcoXbxJj8xNq8Gtg@mail.gmail.com>
Hi Jarno
On 26/03/2025 10:43, Jarno Suni wrote:
> On Wed, Mar 26, 2025 at 12:20 PM Phillip Wood <phillip.wood123@gmail.com> wrote:
>
>> It appears that the object id for the commit got deleted when the
>> command was changed from "pick" to "reword" and so git does not know
>> which commit this line is referring to. The commit subject is there for
>> the benefit of the user not for git - after all many commits could share
>> the same subject.
>
> The error appeared first time in the rebase after I changed the command
> from pick to drop (or d for short.) I had never used d before but I have
> used e many times without an issue. Even the d command worked after I
> edited the commit message title (in new rebase). So I suspect that there
> is something in wrong in parsing d command.
I'm not sure that explains why the commit object id is missing. If you
are able to reproduce this bug and show the edited todo-list with the
drop commands and the errors produced by that todo-list that would be
very helpful. Without that it is hard to tell what's happening here.
Thanks
Phillip
prev parent reply other threads:[~2025-03-26 15:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-26 7:17 error: could not parse 'Drop' when rebasing Jarno Suni
2025-03-26 10:20 ` Phillip Wood
[not found] ` <CAOqj8L1Ammwp07ju2dweVhRVdkTv=hROaDjcoXbxJj8xNq8Gtg@mail.gmail.com>
2025-03-26 15:12 ` Phillip Wood [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=65e64dda-31e2-43fa-8269-f1bd5f3d26e7@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=jarno.ilari.suni@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.
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).