From: Ian Jackson Date: Mon, 06 Jul 2026 15:03:12 GMT Subject: Re: [PATCH 1/2] git-subtree: Bail out if we find output from Rust rewrite Message-ID: <27211.50096.133710.528147@chiark.greenend.org.uk> In-Reply-To: Hi. Thanks for the quick review. Junio C Hamano writes ("Re: [PATCH 1/2] git-subtree: Bail out if we find output from Rust rewrite"): > If (global) $rev is not set here, we'd check :.git-subtree/config in > the index in order to detect the v2's configuration. It seems to me > that this code however wants to inspect HEAD's tree. This was a slip. The code in reject_if_v2_config is supposed to use its argument (as per the usage comment I added), not a global. I'll fix this with a respin. (I think it may somehow work by accident in my tests.) > The above helper may work for one caller that passes "$rev" but not > for the other caller that passes "HEAD", no? HEAD is a valid revision spec for git-rev-parse, but the function should use $1 (which in that case would be HEAD), not $rev. > if git rev-parse --verify -q "$1:$config" > then > die "fatal: tree contains $config: has been processed with new standalone (Rust) git-subtree; use that tool instead of this one. See https://codeberg.org/diziet/git-subtree https://crates.io/crates/git-subtree" > fi > > Overly long output does not look very easy to read, but I kept it > the same as the original. I'm not a great fan of the long error message myself, but it seemed to be what the rest of the script was doing. I didn't find any multi-line calls to die, so that's why I did it this way. I'm happy to reformat this to your taste. Thanks, Ian. -- Ian Jackson These opinions are my own. Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk, that is a private address which bypasses my fierce spamfilter.