From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:40:48 +0000 (-0700)
Subject: Merge branch 'ns/merge-base-is-ancestor-tests' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e163901e5747dbadcb05ee6724c779e520c770a0;p=thirdparty%2Fgit.git

Merge branch 'ns/merge-base-is-ancestor-tests' into jch

Tests for 'git merge-base --is-ancestor' have been added to cover
exit codes (0 for success, 1 for non-ancestor, 128 for errors) and
to ensure it cannot be combined with '--all'.

* ns/merge-base-is-ancestor-tests:
  merge-base: add tests for --is-ancestor
---

e163901e5747dbadcb05ee6724c779e520c770a0