Re: Bug report - Apple git

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx/





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux