Package: git-buildpackage Version: 0.6.0~git20120601 Severity: wishlist File: /usr/bin/git-dch
Dear Maintainer,
I'm trying to exclude upstream logs from debian/changelog, or more
precisely, just saying that a new upstream release was merged.
Here is my use case:
o-o-o-o-C <- upstream/1.3.4
\ \
o-o-A-B-o-D-E-F <- debian/1.3.4-1
- B: Last debian package (commit registering the git-dch call
- C: commit pointed by the tag upstream/1.3.4
- D: merge commit with message "New upstream release"
- E: commit to update the packaging (whatever happens under "debian/")
- F: commit registering the git-dch call
In my debian/changelog, I want something like:
package (1.3.4-1) UNRELEASED; urgency=low
* [2291ce3] New upstream release
* [8517689] Bump standard version
-- Daniel Dehennin <daniel.dehen...@baby-gnu.org> Sun, 22 Jul 2012
13:10:29 +0200
After looking at the verbose output of git-dch, I finally got a
--git-log that works:
git log B..HEAD --min-parents=1 ^C
outputs: D, E
To use those options as general case, I tried to modify my ~/.gbp.conf
with something generic:
git-log = --min-parents=1 ^$(git describe --abbrev=0 --match upstream/\*)
But this fails because of tokenisation of the configuration line:
gbp:debug: ['git', 'log', '--pretty=format:%H', 'B..HEAD',
'--min-parents=1', '^$(git', 'describe', '--abbrev=0', '--match',
'upstream/\\*)', '--']
It could be useful to have some replacement strings like the
'%(version)s' one:
- "%(last_upstream)s": ID of the latest merged upstream commit, C in my
example, depending of the configuration, we have:
* %(last_upstream)s = git merge-base HEAD %(upstream_branch)s
* %(last_upstream)s = git describe --tags --abbrev=0 --match %(upstream_tag)s
- "%(since)s", or "%(base)s" or "%(last_dch)s": the ID of the commit
where debian/changelog was last touched, B in my example
With something like that, I could configure git-dch globally with:
git-log = --min-parents=1 ^%(last_upstream)s
Regards.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (90, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0+hati.2 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages git-buildpackage depends on:
ii devscripts 2.12.1
ii git 1:1.7.10.4-1
ii python 2.7.3-1
ii python-dateutil 1.5+dfsg-0.1
Versions of packages git-buildpackage recommends:
pn cowbuilder <none>
ii pristine-tar 1.25
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-3
ii unzip 6.0-7
-- no debconf information
--
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF
pgpPlBJxonV7F.pgp
Description: PGP signature
