From: Christopher Fretz <cfretz@icloud.com>
To: Kristoffer Haugsbakk <code@khaugsbakk.name>
Cc: git@vger.kernel.org
Subject: Re: git rebase --root bug
Date: Wed, 10 May 2023 22:07:08 -0600 [thread overview]
Message-ID: <C3061274-3B8C-4593-B2B3-7C6BCB3AA19E@icloud.com> (raw)
In-Reply-To: <1efe92ee-6ae0-4588-ba67-b7632c7ea97e@app.fastmail.com>
Interestingly, I just tried the same on a personal laptop with a fully up-to-date version of git, and I get a more descriptive error:
$ git rebase --continue
error: invalid onto: ‘bdb3861a5176d64862366d702dd5abd396b18ab4'
Not sure what the cause is for the difference in error messages, we appear to be using the same version, but the issue appears to still be present in the most recent release of git regardless.
[System Info]
git version:
git version 2.40.1
cpu: arm64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
feature: fsmonitor--daemon
uname: Darwin 22.4.0 Darwin Kernel Version 22.4.0: Mon Mar 6 20:59:28 PST 2023; root:xnu-8796.101.5~3/RELEASE_ARM64_T6000 arm64
compiler info: clang: 14.0.3 (clang-1403.0.22.14.1)
libc info: no libc information available
$SHELL (typically, interactive shell): /bin/zsh
[Enabled Hooks]
> On May 10, 2023, at 2:35 PM, Kristoffer Haugsbakk <code@khaugsbakk.name> wrote:
>
> On Wed, May 10, 2023, at 22:08, Christopher Fretz wrote:
>> Thank you for filling out a Git bug report!
>
> I get a more generic error:
>
> $ git rebase --continue
> fatal: No rebase in progress?
>
> [System Info]
> git version:
> git version 2.40.1
> cpu: x86_64
> no commit associated with this build
> sizeof-long: 8
> sizeof-size_t: 8
> shell-path: /bin/sh
> uname: Linux 5.4.0-148-generic #165~18.04.1-Ubuntu SMP Thu Apr 20 01:14:06 UTC 2023 x86_64
> compiler info: gnuc: 7.5
> libc info: glibc: 2.27
> $SHELL (typically, interactive shell): /bin/bash
>
>
> [Enabled Hooks]
>
> --
> Kristoffer Haugsbakk
next prev parent reply other threads:[~2023-05-11 4:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 20:08 git rebase --root bug Christopher Fretz
2023-05-10 20:35 ` Kristoffer Haugsbakk
2023-05-11 4:07 ` Christopher Fretz [this message]
2023-05-11 14:21 ` Phillip Wood
2023-05-11 16:16 ` Taylor Blau
2023-05-11 19:52 ` Christopher Fretz
2023-05-12 15:18 ` Phillip Wood
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=C3061274-3B8C-4593-B2B3-7C6BCB3AA19E@icloud.com \
--to=cfretz@icloud.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).