git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "D. Ben Knoble" <ben.knoble@gmail.com>,
	Jiang Xin <worldhello.net@gmail.com>
Cc: "André de Castro" <aramosdecastro@gmail.com>,
	git@vger.kernel.org,
	"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
Subject: Re: Bug report - Apple git
Date: Tue, 14 Jan 2025 14:43:27 -0800	[thread overview]
Message-ID: <xmqqv7uh10fk.fsf@gitster.g> (raw)
In-Reply-To: <CALnO6CD35K9O=Wgotij1SiY=N50WiCODY5i-_gBBcGgD73CPjw@mail.gmail.com> (D. Ben Knoble's message of "Tue, 14 Jan 2025 16:57:16 -0500")

"D. Ben Knoble" <ben.knoble@gmail.com> writes:

>> What happened instead? (Actual behavior)
>> Didn't get a diff output. Got the following error instead:
>> "fatal: --merge-base only works with commits"
>> ...
> A shorter workaround is probably "git diff --merge-base
> <your-tag>^{commit} HEAD" (this is the "peeling" that Kristoffer
> references)

Thanks.  

    $ git log -S'only works with commits' ':!po/'

finds 4adceb5a (diff: fix --merge-base with annotated tags,
2023-10-01), which is v2.43.0-rc0~36^2 and v2.43 is from Nov 2023,
so this seems to be a rather ancient bug that has been already fixed
in our codebase.

The reason why I started writing this message is a bit offtopic (and
that is why Jiang is CC'ed).  We do still have that string in our
"codebase" but in po/

    $ git grep -c 'only works with commits' po/
    po/es.po:1
    po/pl.po:1
    po/pt_PT.po:1
    po/ru.po:1

I suspect there may be other strings and translations that are no
longer in use.  

Are they something we can easily remove mechanically, and if so
should we?

Thanks.

      reply	other threads:[~2025-01-14 22:43 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
     [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 [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=xmqqv7uh10fk.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=aramosdecastro@gmail.com \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=worldhello.net@gmail.com \
    /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).