Package: git-buildpackage
Version: 0.4.26
Severity: important
Tags: patch
Regular commits usually look like:
commit 2534b0570308671b793ab677bc32e1bae63beffa
Author: Ove Kaaven <[EMAIL PROTECTED]>
Date: Sat May 3 01:55:25 2008 +0200
but if you merge a branch (e.g. upstream into master), it looks like:
commit 256cafd5441e5263e4b55e993aee8c9623d83d85
Merge: 39a2bc7... 4611de8...
Author: Ove Kaaven <[EMAIL PROTECTED]>
Date: Fri May 2 22:04:14 2008 +0200
Thus, parse_commit can't parse author and raises GbpError exception.
Something like this patch might help.
--- git-dch 2008-04-28 18:58:44.000000000 +0200
+++ git-dch.mod 2008-05-04 00:39:01.000000000 +0200
@@ -146,14 +146,17 @@
thanks = ''
closes = ''
bugs = []
+ start = 1
commit = repo.show(commit)
- m = author_re.match(commit[1])
+ if commit[start].startswith('Merge:'):
+ start += 1
+ m = author_re.match(commit[start])
if not m:
raise GbpError, "can't parse author of commit %s" % commit
else:
author = m.group('author')
- for line in commit[4:]:
+ for line in commit[start+3:]:
if line.startswith(' '): # commit body
line = line[4:]
if line.startswith('Closes: '):
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (650, 'testing'), (600, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core)
Locale: LANG=en_US.ISO-8859-1, LC_CTYPE=en_US.ISO-8859-1 (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.26 scripts to make the life of a Debi
ii git-core 1:1.5.5.1-1 fast, scalable, distributed revisi
ii python 2.5.2-1 An interactive high-level object-o
ii python-dateutil 1.4-1 powerful extensions to the standar
ii python-support 0.7.7 automated rebuilding support for P
git-buildpackage recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
