From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
To: "André de Castro" <aramosdecastro@gmail•com>, git@vger•kernel.org
Subject: Re: Bug report - Apple git
Date: Mon, 13 Jan 2025 17:32:07 +0100 [thread overview]
Message-ID: <5aae11ba-b283-4d04-9336-31d02ff41c93@app.fastmail.com> (raw)
In-Reply-To: <C2871318-4745-4481-9199-72D4544ECD5C@gmail.com>
On Mon, Jan 13, 2025, at 15:23, André de Castro wrote:
> Checked out a branch, ran "git diff --merge-base <some-annotated-tag> HEAD".
>
> What did you expect to happen? (Expected behavior)
> To see a normal git diff output.
>
> What happened instead? (Actual behavior)
> Didn't get a diff output. Got the following error instead:
> "fatal: --merge-base only works with commits"
This works for me on version 2.48.0. It seems to have been fixed in
2.43.0. You would have to update to a newer version.
It looks like it was fixed in 4adceb5a299 (diff: fix --merge-base with
annotated tags, 2023-10-01).[1] The intent of the error message was to
disallow non-commit-ish like trees:
v2.48.0^{tree}
But it also rejected annotated tags instead of peeling them.
🔗 1: https://lore.kernel.org/git/20231001151845.3621551-1-hi@alyssa.is/
next prev parent reply other threads:[~2025-01-13 16:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-13 14:23 Bug report - Apple git André de Castro
2025-01-13 16:32 ` Kristoffer Haugsbakk [this message]
[not found] ` <B50229FA-0C33-4DFD-B8D9-79F30D616F86@gmail.com>
2025-01-13 16:50 ` André de Castro
2025-01-13 16:35 ` Torsten Bögershausen
2025-01-14 21:57 ` D. Ben Knoble
2025-01-14 22:43 ` Junio C Hamano
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=5aae11ba-b283-4d04-9336-31d02ff41c93@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=aramosdecastro@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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