Hi Eddie
[we reply inline on this mailing list, see below :)]
Le 2021-10-07 à 02:00, Eddie Ridwan a écrit :
Hi Philippe
Using the debug option (see attached file), I see that the git push
subtree command is complaining that many commits are in the wrong
order.
Indeed, the attachment shows many messages like:
progress: 1/ 131 (0) [0]
Processing commit: 1fbbdda4f0ef15794eeb4a343d3fb1bf17fbb853
parents: c75f7cab156c91a1bf3b36658e1ac94dd1905bba
incorrect order: c75f7cab156c91a1bf3b36658e1ac94dd1905bba
Any idea how this could happen? And is there any way to recover from this?
I'm not a 'git subtree' user myself, so really don't know unfortunately.
Would it be best to just delete the subtree and start again?
You could do that. If you do want to debug further, I would suggest
searching the mailing list (see https://lore.kernel.org/git/_/text/help/)
for recent contributors to 'contrib/subtree' and CC-ing them. Maybe they
will be able to provide more insight here.
You also asked on Stack Overflow if you should try to delete the subtree
cache. I think this could be something to try (I would guess if it's called
a cache, it should be recreated). But again I'm not a 'git subtree' user.
Many thanks
Eddie Ridwan
Cheers,
Philippe.
