From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:40:46 +0000 (-0700)
Subject: Merge branch 'ij/subtree-reject-v2-config' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=686569989a46a29725b803bf74ecfdff82eea47b;p=thirdparty%2Fgit.git

Merge branch 'ij/subtree-reject-v2-config' into jch

The shell script implementation of 'git subtree' has been updated to
check for the presence of the configuration file of the new Rust
implementation, preventing users from accidentally running the old
script on repositories already managed by the new tool.

* ij/subtree-reject-v2-config:
  git-subtree: Bail out if we find output from Rust rewrite (test)
  git-subtree: Bail out if we find output from Rust rewrite
---

686569989a46a29725b803bf74ecfdff82eea47b