Hi, On Tue, Sep 02, 2025 at 05:32:10PM +0200, Lee Garrett wrote: > Package: git-buildpackage > Version: 0.9.38 > Severity: wishlist > X-Debbugs-Cc: [email protected] > > Hi, > > in the LTS team we regularly create new git repos conforming to DEP-14 and > import source packages into it. > > For example: > gbp import-dsc --create-missing-branches --debian-branch=debian/bookworm > --upstream-branch=upstream/bookworm ../git_2.39.5-0+deb12u2.dsc > > This however has the problem that gbp will use the *current* branch as point > to > create the new branch debian/bookworm, which will in then carry the history of > an unrelated release with it.
I don't understand what you're describing here. There are no "current branches" in a newly create repo. If I understand your problem correctly then just don't create the repo beforehand: ``` gbp import-dsc --debian-branch=debian/bookworm --upstream-branch=upstream/bookworm apt:git/sid ``` I get exactly two branches; ``` $ git branch * debian/bookworm upstream/bookworm ``` Which is what I'd expect in these situations so I'd say we don't need to do anything here. Cheers, -- Guido > > A workaround exists: > You can create the branches e.g. debian/bookworm and upstream/bookworm, and > add > empty commits there. Then the command above will correctly create a detached > history. > > So my request is adding e.g. --create-orphaned-branches will will in this case > use `git checkout --orphan upstream/bookworm` before importing the ustream > source onto it. > > Thanks for maintaining gbp! > > Greetings, > Lee > > -- System Information: > Debian Release: 13.1 > APT prefers stable-security > APT policy: (990, 'stable-security'), (990, 'proposed-updates'), (990, > 'stable') > Architecture: amd64 (x86_64) > > Kernel: Linux 6.12.41+deb13-amd64 (SMP w/8 CPU threads; PREEMPT) > Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE > Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE not > set > Shell: /bin/sh linked to /usr/bin/dash > Init: systemd (via /run/systemd/system) > LSM: AppArmor: enabled > > Versions of packages git-buildpackage depends on: > ii devscripts 2.25.15+deb13u1 > ii git 1:2.47.3-0+deb13u1 > ii man-db 2.13.1-1 > ii python3 3.13.5-1 > ii python3-dateutil 2.9.0-4 > ii python3-yaml 6.0.2-1+b2 > ii sensible-utils 0.0.25 > > Versions of packages git-buildpackage recommends: > ii pristine-tar 1.50+nmu2 > ii python3-requests 2.32.3+dfsg-5 > ii sbuild 0.89.3+deb13u1 > > Versions of packages git-buildpackage suggests: > ii python3-notify2 0.3.1-1 > ii sudo 1.9.16p2-3 > ii unzip 6.0-29 > > -- no debconf information >
