Debian Bug report logs - #924284
git-buildpackage: import-dscs overwrites pre-existing upstream tags

version graph

Package: git-buildpackage; Maintainer for git-buildpackage is Guido Günther <[email protected]>; Source for git-buildpackage is src:git-buildpackage (PTS, buildd, popcon).

Reported by: nicoo <[email protected]>

Date: Mon, 11 Mar 2019 00:33:01 UTC

Severity: normal

Found in version git-buildpackage/0.9.13

Full log

🔗 View this message in rfc822 format

X-Loop: [email protected]
Subject: Bug#924284: git-buildpackage: import-dscs overwrites pre-existing upstream tags
Reply-To: Guido Günther <[email protected]>, [email protected]
Resent-From: Guido Günther <[email protected]>
Resent-To: [email protected]
X-Loop: [email protected]
Resent-Date: Thu, 21 Mar 2019 09:39:06 +0000
Resent-Message-ID: <[email protected]>
Resent-Sender: [email protected]
X-Debian-PR-Message: followup 924284
X-Debian-PR-Package: git-buildpackage
X-Debian-PR-Keywords: 
References: <155226421580.5298.18138069891976088481.reportbug@neon.citronna.de> <155226421580.5298.18138069891976088481.reportbug@neon.citronna.de>
X-Debian-PR-Source: git-buildpackage
Received: via spool by [email protected] id=B924284.155316097916230
          (code B ref 924284); Thu, 21 Mar 2019 09:39:06 +0000
Received: (at 924284) by bugs.debian.org; 21 Mar 2019 09:36:19 +0000
X-Spam-Checker-Version: SpamAssassin 3.4.2-bugs.debian.org_2005_01_02
	(2018-09-13) on buxtehude.debian.org
X-Spam-Level: 
X-Spam-Status: No, score=-16.8 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER,
	MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_NONE,TXREP autolearn=ham
	autolearn_force=no version=3.4.2-bugs.debian.org_2005_01_02
X-Spam-Bayes: score:0.0000 Tokens: new, 16; hammy, 150; neutral, 81; spammy,
	0. spammytokens: hammytokens:0.000-+--H*u:1.10.1, 0.000-+--H*UA:1.10.1,
	 0.000-+--H*u:2018-07-13, 0.000-+--H*UA:2018-07-13, 0.000-+--upstreams
Received: from honk.sigxcpu.org ([24.134.29.49])
	by buxtehude.debian.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.89)
	(envelope-from <[email protected]>)
	id 1h6u7W-0004DB-Nh
	for [email protected]; Thu, 21 Mar 2019 09:36:19 +0000
Received: from localhost (localhost [127.0.0.1])
	by honk.sigxcpu.org (Postfix) with ESMTP id 923D9FB04;
	Thu, 21 Mar 2019 10:36:14 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at honk.sigxcpu.org
Received: from honk.sigxcpu.org ([127.0.0.1])
	by localhost (honk.sigxcpu.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 4aJtieEqWlqR; Thu, 21 Mar 2019 10:33:03 +0100 (CET)
Received: by bogon.sigxcpu.org (Postfix, from userid 1000)
	id A9B5040C9C; Thu, 21 Mar 2019 10:33:02 +0100 (CET)
Date: Thu, 21 Mar 2019 10:33:02 +0100
From: Guido Günther <[email protected]>
To: Nicolas Braud-Santoni <[email protected]>, [email protected]
Message-ID: <[email protected]>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <155226421580.5298.18138069891976088481.reportbug@neon.citronna.de>
User-Agent: Mutt/1.10.1 (2018-07-13)

Hi,
On Mon, Mar 11, 2019 at 01:30:15AM +0100, Nicolas Braud-Santoni wrote:
> Package: git-buildpackage
> Version: 0.9.13
> Severity: normal
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
> 
> Hi,
> 
> I'm trying to import am existing package in git, with the caveat that I already
> set up the upstream branch and tags -- I want to base it off upstream's git
> history, so I can easily cherry-pick patches.
> 
> Unfortunately, when running `gbp import-dscs --debsnap` I ran into two
> issues:

I don't think that use case is well supported yet.

> 
> 1. The current content of the branch are overwritten, including debian/gbp.conf,
>    and so gbp stops observing parameters set there.
> 
>    It is easily worked around by passing those parameters on the CLI, but gbp
>    should probably read its configuration once and keep it in memory through the
>    whole execution.

You can ignore all repo's gbp.conf via `--ignore-repo-config` but that
won't help since the existing one isn't read either. You can run
gbp-import-dsc for each version individually which will make it pick up
the right config.

> 2. gbp import-dscs will overwrite existing upstream branch and tags.
> 
>    The behaviour I expected would have been to keep the existing tags,
>    and import the content of debian/ in the packaging branch (along with adding
>    the necessary data for pristine-tar).

I would have expected it to overwrite branch content but not tags since
we don't pass --allow-same-version and that would only affect debian
tags anyway. Do you have a testcase that shows how tags are
"overwritten".

I'm happy to take patches to improve the situation otherwise running
gbp-import-dscs on an empty repo and adding the existing package as a
remote should work better.

Cheers,
 -- Guido

Send a report that this bug log contains spam.

Debian bug tracking system administrator <[email protected]>. Last modified: Tue May 13 17:39:02 2025; Machine Name: buxtehude

Debian Bug tracking system

Debbugs is free software and licensed under the terms of the GNU General Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

Copyright © 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson, 2005-2017 Don Armstrong, and many other contributors.