Package: git-buildpackage
Version: 0.4.68
Severity: normal
Tags: patch
I've been importing nfs-utils and ethtool history into git alongside
the upstream git branch. For each upstream release I set the upstream
branch to the corresponding git commit. git-import-dsc then applies
changes from the tarball (e.g. addition of autotools-generated files)
and tags the result. However, when there are no changes this fails.
gbp should use the --allow-empty option to git commit:
--- a/gbp/command_wrappers.py
+++ b/gbp/command_wrappers.py
@@ -304,7 +304,7 @@
class GitCommitAll(GitCommand):
"""Wrap git commit to commit all changes"""
def __init__(self, verbose=False, **kwargs):
- args = ['-a'] + [ ['-q'], [] ][verbose]
+ args = ['-a', '--allow-empty'] + [ ['-q'], [] ][verbose]
GitCommand.__init__(self, cmd='commit', args=args, **kwargs)
def __call__(self, msg=''):
--- END ---
Ben.
-- System Information:
Debian Release: squeeze/sid
APT prefers proposed-updates
APT policy: (500, 'proposed-updates'), (500, 'unstable'), (500, 'stable'),
(1, 'experimental')
Architecture: i386 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.64 scripts to make the life of a Debi
ii git [git-core] 1:1.7.1-1 fast, scalable, distributed revisi
ii git-core 1:1.7.1-1 fast, scalable, distributed revisi
ii python 2.6.5-5 An interactive high-level object-o
ii python-dateutil 1.4.1-3 powerful extensions to the standar
ii python-support 1.0.9 automated rebuilding support for P
Versions of packages git-buildpackage recommends:
ii pristine-tar 1.03 regenerate pristine tarballs
Versions of packages git-buildpackage suggests:
pn git-load-dirs <none> (no description available)
-- no debconf information
-- debsums errors found:
debsums: changed file /usr/share/pyshared/gbp/command_wrappers.py (from
git-buildpackage package)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
