From: Christian Heusel <christian@heusel.eu>
Date: Mon, 26 Jan 2026 14:12:30 GMT
Subject: Re: [regression][bisected] git-subtree remote desynchronization
Message-ID: <8c588acc-1626-4ebe-824d-319d721537a1@heusel.eu>
In-Reply-To: <023ae712-8f67-441c-aada-fb5b097ec617@howdoi.land>

On 26/01/25 11:14PM, Colin Stagner wrote:
> <snip>
> 
> On 1/24/26 05:43, Christian Heusel wrote:
> 
> > 1. Update to the 2.53.0-rc1 git release candidate
> > 2. Clone my monorepo for packages in the Arch User Repository:
> >     ```
> >     git clone https://github.com/christian-heusel/aur.git && cd aur
> >     ```
> > 3. Push changes to one of the contained subtree remotes (this would normally be
> >     done via `aurpublish google-chrome`):
> >     ```
> >     git subtree push -P "google-chrome" ssh://aur.archlinux.org/google-chrome.git master
> >     ```
> 
> I cannot `git subtree push` to your remote, but I can instead run:
> 
>     git subtree split -P 'google-chrome'
> 
> which happens internally prior to the push.
> 
> Before the bisected patch [1], running this on your aur.git's master branch
> [2] generates a split commit with hash:
> 
>     e6f4613797c0eea5a8939441a1fb58211e9184e0
> 
> This is the result you expect, right?

Yes this is the result that I expect to get.

All these repositories are also public if you want to take a look at
them, the HTTPS remote is "https://aur.archlinux.org/google-chrome.git",
so you can easily compare the current state to the expected state:

    $ git ls-remote --refs https://aur.archlinux.org/google-chrome.git
    e6f4613797c0eea5a8939441a1fb58211e9184e0	refs/heads/master

This also works equivalently for the other subtrees in that repository.

> I am also testing the other subtrees of aur.git to make sure none of them
> change, either. With the patch reverted, none of them appear to.

Thanks for investigating this, your work is really appreciated!

> I have made some progress on a fix, but I have not yet achieved 100% hash
> equivalence across the board. The bisected patch will likely be reverted
> while I work on a more permanent solution.

I guess that is for you and Junio to judge, but rushing a fix sounds
like unneccesary risk for an optimization.

> [1]: 28a7e27cff (contrib/subtree: detect rewritten subtree commits,
> 2026-01-09)
> 
> [2]: aur.git@29bfddf (upgpkg: rider-eap 1:261.17801.69-1, 2026-01-24)

Cheers,
Chris