Hi Arnaud,

Sorry for my delayed reply.

On 25/11/2025 2:42 am, Arnaud Rebillout wrote:
This time, `gbp import-orig --uscan` does its job, it imports versions
v2.1.0, however... It replaces the submodule with a git commit.

Please tell me if I'm stubbornly missing something.

I believe this is a bug in gbp import-orig. When it imports the tarball, it clobbers the submodule somehow.

I believe I've found the solution, and it looks to me like we have been over-thinking this.

Like you, I started a new repository based on the v2.0.0 tag.

git clone --recurse-submodules https://salsa.debian.org/hmc/maxminddb-golang.git
git switch upstream/latest
git remote add upstreamvcs https://github.com/oschwald/maxminddb-golang.git
git fetch --recurse-submodules upstreamvcs
git merge v2.1.0
git switch debian/latest
uscan -v
# git push --all
# git push --tags

For me, this sequence updates the upstream repository and generates the correct tarball while keeping `git submodule show` enabled.

Let me know how you go with this.

Hugh

Reply via email to