]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ij/subtree-reject-v2-config' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:40:46 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:40:46 +0000 (10:40 -0700)
commit686569989a46a29725b803bf74ecfdff82eea47b
tree921812ab082c610f0ab5e96123e1cbf2f46ef7a7
parent5db641b6a88a546cedefc26d17ac495f22c7a845
parent20b117c1eb19c0e08ede3c7285c991eac4c9345f
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
contrib/subtree/t/t7900-subtree.sh