]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ij/subtree-reject-v2-config' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:10 +0000 (08:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:10 +0000 (08:54 -0700)
commitae5b71e3d58a8bc6ab4635e39b0ebbd8bc75eb40
tree6c77eb3bd8c51478249f1827283d2f9be57697dd
parentb84224f1e196ed431621b1500a07f0e02782c1a0
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