From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Oct 2023 21:18:28 +0000 (-0700)
Subject: Merge branch 'ar/diff-index-merge-base-fix'
X-Git-Tag: v2.43.0-rc0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09dcbb486d964b59222136dd1668023098658eda;p=thirdparty%2Fgit.git

Merge branch 'ar/diff-index-merge-base-fix'

"git diff --merge-base X other args..." insisted that X must be a
commit and errored out when given an annotated tag that peels to a
commit, but we only need it to be a committish.  This has been
corrected.

* ar/diff-index-merge-base-fix:
  diff: fix --merge-base with annotated tags
---

09dcbb486d964b59222136dd1668023098658eda