Package: git-buildpackage
Version: 0.5.11
Severity: normal
When git-buildpackage looks for a matching pristine-tar commit, it
will use the earliest commit that matches. While normally, there
should be only a single matching commit, there might be multiple when,
for example, the initially checked-in original tarball was bogus.
This happened to me when sponsoring failmalloc[0], where the initial
pristine tarball was an accidentially repacked one.
[0] git://git.debian.org/collab-maint/failmalloc.git
Here is some output that should help to illustrate the issue:
% git-buildpackage --git-verbose --git-export-dir=$PWD/../build-area -uc -us -S
gbp:debug: ['git', 'branch', '--no-color']
gbp:debug: debuild -d clean [] []
dh clean --with autotools-dev
dh_testdir
dh_auto_clean
dh_autotools-dev_restoreconfig
dh_clean
gbp:debug: ['git', 'status']
gbp:debug: ['git', 'branch', '--no-color']
gbp:debug: ['git', 'log', '--pretty=format:%H', '--grep=pristine-tar .*
failmalloc_1.0\\.orig.tar\\.', 'pristine-tar', '--']
gbp:debug: Found pristine-tar commit at
'363b271298c651f4deda9ce933833af5d76eacaf'
[...]
Note the commit ID in the last line, and compare to the history of the
pristine-tar branch:
% git log --grep='pristine-tar .* failmalloc_1.0\.orig.tar\.' pristine-tar --
commit e572192e5478e944edd9758d40d9eb05fe987d4e
Author: Alessandro Ghedini <al3x...@gmail.com>
Date: Fri Jan 14 14:24:09 2011 +0100
pristine-tar data for failmalloc_1.0.orig.tar.gz
commit 363b271298c651f4deda9ce933833af5d76eacaf
Author: Alessandro Ghedini <al3x...@gmail.com>
Date: Tue Jan 4 12:07:03 2011 +0100
pristine-tar data for failmalloc_1.0.orig.tar.gz
git-buildpackage picks the second (earlier commit), when, IMHO, it
should choose the first one.
Regards, Rotty
-- System Information:
Debian Release: 6.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=de_AT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.69 scripts to make the life of a Debi
ii git [git-core] 1:1.7.2.3-2.2 fast, scalable, distributed revisi
ii git-core 1:1.7.2.3-2.2 fast, scalable, distributed revisi
ii python 2.6.6-3+squeeze4 interactive high-level object-orie
ii python-dateutil 1.4.1-3 powerful extensions to the standar
ii python-support 1.0.11 automated rebuilding support for P
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.62+nmu2 pbuilder running on cowdancer
ii pristine-tar 1.11 regenerate pristine tarballs
Versions of packages git-buildpackage suggests:
pn git-load-dirs <none> (no description available)
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
